join-cvs — CVS commits for JOIN

[Join-cvs] join1/src/web/jsp/environment environmentmapping.jsp, 1.1, 1.2 environmentview.jsp, 1.3, 1.4 environmentviews.jsp, 1.2, 1.3

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/web/jsp/environment
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14928/jsp/environment

Modified Files:
	environmentmapping.jsp environmentview.jsp 
	environmentviews.jsp 
Log Message:
Adding getting configuratin at date feature

Index: environmentviews.jsp
===================================================================
RCS file: /cvsroot/join/join1/src/web/jsp/environment/environmentviews.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** environmentviews.jsp	14 Jan 2007 18:13:15 -0000	1.2
--- environmentviews.jsp	8 Apr 2007 22:30:13 -0000	1.3
***************
*** 33,36 ****
--- 33,41 ----
              <bean:write name="element" property="logicalEnvironment.label"/>
              <bean:define id="key" name="element" property="logicalEnvironment.key" toScope="page" />
+             <logic:present name="element" property="logicalEnvironment.activeEnvironmentMapping">
+                <bean:define id="idStr" name="element" property="logicalEnvironment.id" toScope="page" />
+                &nbsp; <html:link action="/physicalEnvironment?op=details&fromLogical=true" paramId="idStr" paramName="idStr">
+                <html:img page="/images/22x22/details.gif" alt="Infos" align="absmiddle"/></html:link>
+             </logic:present>
              <html:img page="/images/16x16/down.gif" styleId="<%= "env" + key + "-ud" %>" align="absmiddle"
                 onclick="<%= "showHide('" + key + "env', 'env" + key + "-ud')" %>" style="position:absolute; right: 26px;"/>

Index: environmentmapping.jsp
===================================================================
RCS file: /cvsroot/join/join1/src/web/jsp/environment/environmentmapping.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** environmentmapping.jsp	30 Jul 2006 19:39:16 -0000	1.1
--- environmentmapping.jsp	8 Apr 2007 22:30:13 -0000	1.2
***************
*** 31,35 ****
        </div>
        <br/> <html:img page="/images/22x22/no.gif" align="absmiddle"/>
!       <html:link action="/environmentMapping?op=close" paramId="idStr" paramName="mapping" paramProperty="id"><bean:message bundle="gui" key="title.envmapping.close"/> ...</html:link>
     </div>
  </logic:present>
--- 31,36 ----
        </div>
        <br/> <html:img page="/images/22x22/no.gif" align="absmiddle"/>
!       <html:link action="/environmentMapping?op=close" paramId="idStr" paramName="mapping" paramProperty="id">
!       <bean:message bundle="gui" key="title.envmapping.close"/> ...</html:link>
     </div>
  </logic:present>

Index: environmentview.jsp
===================================================================
RCS file: /cvsroot/join/join1/src/web/jsp/environment/environmentview.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** environmentview.jsp	14 Jan 2007 18:13:15 -0000	1.3
--- environmentview.jsp	8 Apr 2007 22:30:13 -0000	1.4
***************
*** 1,3 ****
- <%@ page import="org.figure8.join.businessobjects.environment.VersionedResource"%>
  <% // $Revision$ %>
  
--- 1,2 ----
***************
*** 33,50 ****
        </html:form>
     </div>
  </logic:present>
- <br/>
  <logic:present name="environment" scope="request">
     <div class="h3">
        <h3>
           <html:img page="/images/22x22/environment.gif" align="absmiddle"/>
!          <logic:present parameter="from">
!             <bean:define id="logicalEnvName" name="logicalEnvironment" property="name" toScope="page"/>
              <bean:message bundle="gui" key="title.environment.details" arg0="<%= (String)logicalEnvName %>"/>
!          </logic:present>
!          <logic:notPresent parameter="from">
              <bean:define id="physicalEnvName" name="environment" property="name" toScope="page"/>
              <bean:message bundle="gui" key="title.environment.details" arg0="<%= (String)physicalEnvName %>"/>
!          </logic:notPresent>
           <logic:present name="viewDate" scope="request">
              &nbsp;-&nbsp;<bean:write name="viewDate" formatKey="pattern.date.timetostring"/>
--- 32,49 ----
        </html:form>
     </div>
+    <br/>
  </logic:present>
  <logic:present name="environment" scope="request">
     <div class="h3">
        <h3>
           <html:img page="/images/22x22/environment.gif" align="absmiddle"/>
!          <logic:equal parameter="fromLogical" value="true">
!             <bean:define id="logicalEnvName" name="logicalEnvironment" property="label" toScope="page"/>
              <bean:message bundle="gui" key="title.environment.details" arg0="<%= (String)logicalEnvName %>"/>
!          </logic:equal>
!          <logic:notEqual parameter="fromLogical" value="true">
              <bean:define id="physicalEnvName" name="environment" property="name" toScope="page"/>
              <bean:message bundle="gui" key="title.environment.details" arg0="<%= (String)physicalEnvName %>"/>
!          </logic:notEqual>
           <logic:present name="viewDate" scope="request">
              &nbsp;-&nbsp;<bean:write name="viewDate" formatKey="pattern.date.timetostring"/>
***************
*** 100,106 ****
                    </div>
                    <br/>
!                   <html:img page="/images/22x22/add.gif" align="absmiddle"/>
!                   <html:link action="/resource?category=Service" paramId="environmentKey" paramName="environment" paramProperty="key" >
!                   <bean:message bundle="gui" key="title.physicalenv.addingservice"/> ...</html:link>
                 </div>
              </div>
--- 99,109 ----
                    </div>
                    <br/>
!                   <logic:notPresent name="viewDate" scope="request">
!                      <join:authorize role="joiner">
!                         <html:img page="/images/22x22/add.gif" align="absmiddle"/>
!                         <html:link action="/resource?category=Service" paramId="environmentKey" paramName="environment" paramProperty="key" >
!                         <bean:message bundle="gui" key="title.physicalenv.addingservice"/> ...</html:link>
!                      </join:authorize>
!                   </logic:notPresent>
                 </div>
              </div>
***************
*** 156,162 ****
                    </div>
                    <br/>
!                   <html:img page="/images/22x22/add.gif" align="absmiddle"/>
!                   <html:link action="/resource?category=VersionedResource" paramId="environmentKey" paramName="environment" paramProperty="key" >
!                   <bean:message bundle="gui" key="title.physicalenv.addingresource"/> ...</html:link>
                 </div>
              </div>
--- 159,169 ----
                    </div>
                    <br/>
!                   <logic:notPresent name="viewDate" scope="request">
!                      <join:authorize role="joiner">
!                         <html:img page="/images/22x22/add.gif" align="absmiddle"/>
!                         <html:link action="/resource?category=VersionedResource" paramId="environmentKey" paramName="environment" paramProperty="key" >
!                         <bean:message bundle="gui" key="title.physicalenv.addingresource"/> ...</html:link>
!                      </join:authorize>
!                   </logic:notPresent>
                 </div>
              </div>
***************
*** 206,212 ****
                    </div>
                    <br/>
!                   <html:img page="/images/22x22/add.gif" align="absmiddle"/>
!                   <html:link action="/resource?category=Gateway" paramId="environmentKey" paramName="environment" paramProperty="key" >
!                   <bean:message bundle="gui" key="title.physicalenv.addinggateway"/> ...</html:link>
                 </div>
              </div>
--- 213,223 ----
                    </div>
                    <br/>
!                   <logic:notPresent name="viewDate" scope="request">
!                      <join:authorize role="joiner">
!                         <html:img page="/images/22x22/add.gif" align="absmiddle"/>
!                         <html:link action="/resource?category=Gateway" paramId="environmentKey" paramName="environment" paramProperty="key" >
!                         <bean:message bundle="gui" key="title.physicalenv.addinggateway"/> ...</html:link>
!                      </join:authorize>
!                   </logic:notPresent>
                 </div>
              </div>
***************
*** 234,246 ****
                       <legend><html:img page="/images/16x16/history.gif" alt="Environment configuration history" align="absmiddle"/> <bean:message bundle="gui" key="title.environment.history"/></legend>
                       <br/>
!                      <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/>
!                      <html:link action="/environmentMapping?op=view" paramId="physicalEnvKey" paramName="environment" paramProperty="key">
!                      <bean:message bundle="gui" key="label.physicalenv.history.mappings"/></html:link>
!                      <br/><br/>
                       <form action="<%= request.getContextPath() %>/action/physicalEnvironment" name="bydate" method="post">
!                         <input type="hidden" name="op" value="details"/>
!                         <input type="hidden" name="idStr" value='<bean:write name="environment" property="id"/>'/>
                          <bean:message bundle="gui" key="label.physicalenv.history.viewbydate"/>
                          <table>
--- 245,268 ----
                       <legend><html:img page="/images/16x16/history.gif" alt="Environment configuration history" align="absmiddle"/> <bean:message bundle="gui" key="title.environment.history"/></legend>
                       <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/>
!                         <html:link action="/environmentMapping?op=view" paramId="physicalEnvKey" paramName="environment" paramProperty="key">
!                         <bean:message bundle="gui" key="label.physicalenv.history.mappings"/></html:link>
!                         <br/><br/>
!                      </logic:notEqual>
                       <form action="<%= request.getContextPath() %>/action/physicalEnvironment" name="bydate" method="post">
!                         <input type="hidden" name="op" value="config"/>
!                         <!-- Add environment key depending on environment type -->
!                         <logic:equal parameter="fromLogical" value="true">
!                            <input type="hidden" name="key" value='<bean:write name="logicalEnvironment" property="key"/>'/>
!                            <input type="hidden" name="fromLogical" value="true"/>
!                         </logic:equal>
!                         <logic:notEqual parameter="fromLogical" value="true">
!                            <input type="hidden" name="key" value='<bean:write name="environment" property="key"/>'/>
!                            <input type="hidden" name="fromLogical" value="false"/>
!                         </logic:notEqual>
! 
                          <bean:message bundle="gui" key="label.physicalenv.history.viewbydate"/>
                          <table>
***************
*** 269,306 ****
                       </form>
                       &nbsp; &nbsp;
!                      <form action="<%= request.getContextPath() %>/action/physicalEnvironment" name="tracking" method="post">
!                         <input type="hidden" name="rd" value="popup"/>
!                         <input type="hidden" name="op" value="changes"/>
!                         <input type="hidden" name="key" value='<bean:write name="environment" property="key"/>'/>
!                         <bean:message bundle="gui" key="label.physicalenv.history.tracking"/>
!                         <table>
!                            <tr>
!                               <td width="20"></td>
!                               <td>
!                                  <table>
!                                     <tr>
!                                        <td><b><bean:message bundle="gui" key="label.physicalenv.history.startdate"/></b> :</td>
!                                        <td>
!                                           <input type="text" name="startDateStr" size="11" maxlength="10"/> &nbsp;
!                                           <img src="<%= request.getContextPath() %>/images/16x16/date.gif" align="absmiddle"
!                                              onmouseover="toggleDatePicker('dptksd', 'tracking.startDateStr', '<bean:message key='pattern.date.stringtodate'/>')"/>
!                                           <div id="dptksd" style="position: absolute;"></div>
!                                        </td>
!                                     </tr>
!                                     <tr>
!                                        <td><b><bean:message bundle="gui" key="label.physicalenv.history.enddate"/></b> :</td>
!                                        <td>
!                                           <input type="text" name="endDateStr" size="11" maxlength="10"/> &nbsp;
!                                           <img src="<%= request.getContextPath() %>/images/16x16/date.gif" align="absmiddle"
!                                              onmouseover="toggleDatePicker('dptked', 'tracking.endDateStr', '<bean:message key='pattern.date.stringtodate'/>')"/>
!                                           <div id="dptked" style="position: absolute;"></div>
!                                        </td>
!                                     </tr>
!                                  </table>
!                               </td>
!                               <td>&nbsp; <input type="button" class="button" value='<bean:message bundle="gui" key="label.global.submit"/>' onClick="javascript:launch2('tracking', 2, '')"></td>
!                            </tr>
!                         </table>
!                      </form>
                       <br/>
                       <jsp:include page="/includes/formfooter.jsp" />
--- 291,330 ----
                       </form>
                       &nbsp; &nbsp;
!                      <logic:notEqual parameter="fromLogical" value="true">
!                         <form action="<%= request.getContextPath() %>/action/physicalEnvironment" name="tracking" method="post">
!                            <input type="hidden" name="rd" value="popup"/>
!                            <input type="hidden" name="op" value="changes"/>
!                            <input type="hidden" name="key" value='<bean:write name="environment" property="key"/>'/>
!                            <bean:message bundle="gui" key="label.physicalenv.history.tracking"/>
!                            <table>
!                               <tr>
!                                  <td width="20"></td>
!                                  <td>
!                                     <table>
!                                        <tr>
!                                           <td><b><bean:message bundle="gui" key="label.physicalenv.history.startdate"/></b> :</td>
!                                           <td>
!                                              <input type="text" name="startDateStr" size="11" maxlength="10"/> &nbsp;
!                                              <img src="<%= request.getContextPath() %>/images/16x16/date.gif" align="absmiddle"
!                                                 onmouseover="toggleDatePicker('dptksd', 'tracking.startDateStr', '<bean:message key='pattern.date.stringtodate'/>')"/>
!                                              <div id="dptksd" style="position: absolute;"></div>
!                                           </td>
!                                        </tr>
!                                        <tr>
!                                           <td><b><bean:message bundle="gui" key="label.physicalenv.history.enddate"/></b> :</td>
!                                           <td>
!                                              <input type="text" name="endDateStr" size="11" maxlength="10"/> &nbsp;
!                                              <img src="<%= request.getContextPath() %>/images/16x16/date.gif" align="absmiddle"
!                                                 onmouseover="toggleDatePicker('dptked', 'tracking.endDateStr', '<bean:message key='pattern.date.stringtodate'/>')"/>
!                                              <div id="dptked" style="position: absolute;"></div>
!                                           </td>
!                                        </tr>
!                                     </table>
!                                  </td>
!                                  <td>&nbsp; <input type="button" class="button" value='<bean:message bundle="gui" key="label.global.submit"/>' onClick="javascript:launch2('tracking', 2, '')"></td>
!                               </tr>
!                            </table>
!                         </form>
!                      </logic:notEqual>
                       <br/>
                       <jsp:include page="/includes/formfooter.jsp" />

[Join-cvs] join1/src/web/jsp/artifact artifactsbox.jsp, NONE, 1.1 assembly.jsp, 1.2, 1.3

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/web/jsp/artifact
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14147/jsp/artifact

Modified Files:
	assembly.jsp 
Added Files:
	artifactsbox.jsp 
Log Message:


Index: assembly.jsp
===================================================================
RCS file: /cvsroot/join/join1/src/web/jsp/artifact/assembly.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** assembly.jsp	14 Jan 2007 18:10:20 -0000	1.2
--- assembly.jsp	8 Apr 2007 22:27:57 -0000	1.3
***************
*** 57,61 ****
           <table width="100%" border="0">
              <tr>
!                <td width="50%">
                    <div class="h4">
                       <h4>
--- 57,61 ----
           <table width="100%" border="0">
              <tr>
!                <td width="50%" valign="top">
                    <div class="h4">
                       <h4>
***************
*** 74,78 ****
                    </div>
                 </td>
!                <td width="50%">
                    <div class="h4">
                       <h4>
--- 74,78 ----
                    </div>
                 </td>
!                <td width="50%" valign="top">
                    <div class="h4">
                       <h4>

--- NEW FILE: artifactsbox.jsp ---
<% // $Revision: 1.1 $ %>

<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>

<div style="">
   <div class="boxtitle">
      <bean:message bundle="gui" name="<%= request.getParameter("titleKey") %>"/>
   </div>
   <div class="box" style="text-align: right">
      <br/>
      <logic:notEmpty name="<%= request.getParameter("collection") %>" scope="request">
         <logic:iterate id="object" collection="collection" scope="request" length="<%= request.getParameter("limit") %>">
            <span onmouseover="return escape('<bean:write name="object" property="comments"/>');">
            <bean:define id="key" name="object" property="key" toScope="page"/>
            <a href='<%= request.getParameter("linkRoot") + key %>'>
            <bean:write name="object" property="key" />
            <br/>(<bean:write name="object" property="creationDate" formatKey="pattern.date.timetostring" />)
            </a></span>
            <br/><br/>
         </logic:iterate>
      </logic:notEmpty>
      <logic:empty name="<%= request.getParameter("collection") %>" scope="request">

      </logic:empty>
   </div>
</div>

[Join-cvs] join1/src/web/includes menu.jsp,1.5,1.6

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/web/includes
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12940/includes

Modified Files:
	menu.jsp 
Log Message:
Menu entries for help

Index: menu.jsp
===================================================================
RCS file: /cvsroot/join/join1/src/web/includes/menu.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** menu.jsp	1 Mar 2007 00:01:37 -0000	1.5
--- menu.jsp	8 Apr 2007 22:24:48 -0000	1.6
***************
*** 230,236 ****
     <span id="smenu<%= i %>" class="smenu" onmouseover="stopHidding();" onmouseout="stopTimeout();" onfocus="stopHidding();" onblur="stopTimeout();">
        <small>
!          - <a href="<%= request.getContextPath() %>/action/help?op=workflow"><bean:message bundle="gui" key="menu.help.workflow"/></a><br/>
           <join:authorize role="admin">
!             - <a href="<%= request.getContextPath() %>/action/help?op=checklist"><bean:message bundle="gui" key="menu.help.wizard"/></a><br/>
           </join:authorize>
        </small>
--- 230,236 ----
     <span id="smenu<%= i %>" class="smenu" onmouseover="stopHidding();" onmouseout="stopTimeout();" onfocus="stopHidding();" onblur="stopTimeout();">
        <small>
!          - <html:link page="/pages/mainpage.jsp?body=/jsp/workflow.jsp"><bean:message bundle="gui" key="menu.help.workflow"/></html:link><br/>
           <join:authorize role="admin">
!             - <html:link target="new" href="http://join.sourceforge.net/configuring.html"><bean:message bundle="gui" key="menu.help.wizard"/></html:link><br/>
           </join:authorize>
        </small>

[Join-cvs] join1/src/web/images workflow.png,NONE,1.1

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/web/images
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19793/images

Added Files:
	workflow.png 
Log Message:
Adding main scheme image

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

[Join-cvs] join1/src/test/org/figure8/join/businessobjects/environment ParameterValueTest.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18228/businessobjects/environment

Modified Files:
	ParameterValueTest.java 
Log Message:
Fixing Checkstyle errors

Index: ParameterValueTest.java
===================================================================
RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/ParameterValueTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParameterValueTest.java	25 Jul 2006 13:25:07 -0000	1.1
--- ParameterValueTest.java	8 Apr 2007 19:52:51 -0000	1.2
***************
*** 23,27 ****
   * JUnit test case for testing ParameterValue business object.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version Revision$
   */
  public class ParameterValueTest extends TestCase{
--- 23,27 ----
   * JUnit test case for testing ParameterValue business object.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version $Revision$
   */
  public class ParameterValueTest extends TestCase{

[Join-cvs] join1/src/test/org/figure8/join/businessobjects/environment/persistence EnvironmentMappingDaoTest.java, 1.1, 1.2 LogicalEnvironmentDaoTest.java, 1.1, 1.2 ParameterDaoTest.java, 1.1, 1.2 ParameterValueDaoTest.java, 1.1, 1.2 PhysicalEnvironmentDaoTest.java, 1.1, 1.2 ResourceVersionDaoTest.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/persistence
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17009/businessobjects/environment/persistence

Modified Files:
	EnvironmentMappingDaoTest.java LogicalEnvironmentDaoTest.java 
	ParameterDaoTest.java ParameterValueDaoTest.java 
	PhysicalEnvironmentDaoTest.java ResourceVersionDaoTest.java 
Log Message:
Fixing Checkstyle errors

Index: LogicalEnvironmentDaoTest.java
===================================================================
RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/persistence/LogicalEnvironmentDaoTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LogicalEnvironmentDaoTest.java	25 Jul 2006 13:24:32 -0000	1.1
--- LogicalEnvironmentDaoTest.java	8 Apr 2007 19:51:05 -0000	1.2
***************
*** 26,30 ****
   * JUnit test case for testing LogicalEnvironmentDao implementation
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version Revision$$
   */
  public class LogicalEnvironmentDaoTest extends SpringTestCase{
--- 26,30 ----
   * JUnit test case for testing LogicalEnvironmentDao implementation
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version $Revision$
   */
  public class LogicalEnvironmentDaoTest extends SpringTestCase{
***************
*** 33,37 ****
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{"classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  
--- 33,38 ----
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{
!       "classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  
***************
*** 65,69 ****
        Step step = new Step("logEnvCreation", 1);
        Release release = new Release("1.0", 1, 0, new Date());
!       LogicalEnvironment env = new LogicalEnvironment("creationKey", "creationLabel", "creationDescription", "managerId", step, release);
        int size = getLogicalEnvironmentListSize();
        stepDao.save(step);
--- 66,71 ----
        Step step = new Step("logEnvCreation", 1);
        Release release = new Release("1.0", 1, 0, new Date());
!       LogicalEnvironment env = new LogicalEnvironment("creationKey", "creationLabel", "creationDescription",
!                                                          "managerId", step, release);
        int size = getLogicalEnvironmentListSize();
        stepDao.save(step);
***************
*** 79,83 ****
        Step step = new Step("logEnvFindByKey", 2);
        Release release = new Release("2.0", 2, 0, new Date());
!       LogicalEnvironment env = new LogicalEnvironment("findByKey", "findByLabel", "findByDescription", "managerId", step, release);
        int size = getLogicalEnvironmentListSize();
        stepDao.save(step);
--- 81,86 ----
        Step step = new Step("logEnvFindByKey", 2);
        Release release = new Release("2.0", 2, 0, new Date());
!       LogicalEnvironment env = new LogicalEnvironment("findByKey", "findByLabel", "findByDescription",
!                                                          "managerId", step, release);
        int size = getLogicalEnvironmentListSize();
        stepDao.save(step);

Index: PhysicalEnvironmentDaoTest.java
===================================================================
RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/persistence/PhysicalEnvironmentDaoTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PhysicalEnvironmentDaoTest.java	25 Jul 2006 13:24:32 -0000	1.1
--- PhysicalEnvironmentDaoTest.java	8 Apr 2007 19:51:06 -0000	1.2
***************
*** 20,24 ****
   * JUnit test case for testing PhysicalEnvironmentDao implementation.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version Revision$$
   */
  public class PhysicalEnvironmentDaoTest extends SpringTestCase{
--- 20,24 ----
   * JUnit test case for testing PhysicalEnvironmentDao implementation.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version $Revision$
   */
  public class PhysicalEnvironmentDaoTest extends SpringTestCase{
***************
*** 27,31 ****
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{"classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  
--- 27,32 ----
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{
!       "classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  

Index: ParameterValueDaoTest.java
===================================================================
RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/persistence/ParameterValueDaoTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParameterValueDaoTest.java	25 Jul 2006 13:24:32 -0000	1.1
--- ParameterValueDaoTest.java	8 Apr 2007 19:51:06 -0000	1.2
***************
*** 26,30 ****
   * JUnit test case for testing ParameterValueDao implementation.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version Revision$
   */
  public class ParameterValueDaoTest extends SpringTestCase{
--- 26,30 ----
   * JUnit test case for testing ParameterValueDao implementation.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version $Revision$
   */
  public class ParameterValueDaoTest extends SpringTestCase{
***************
*** 33,37 ****
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{"classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  
--- 33,38 ----
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{
!       "classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  
***************
*** 149,154 ****
        for (int i=0; i < values.size(); i++){
           ParameterValue foundValue = (ParameterValue)values.get(i);
!          assertTrue("Value is one of historical ones",
!                  "findHistorical".equals(foundValue.getValue()) || "findHistorical-updated".equals(foundValue.getValue()));
        }
     }
--- 150,155 ----
        for (int i=0; i < values.size(); i++){
           ParameterValue foundValue = (ParameterValue)values.get(i);
!          assertTrue("Value is one of historical ones", "findHistorical".equals(foundValue.getValue())
!                                                          || "findHistorical-updated".equals(foundValue.getValue()));
        }
     }

Index: ResourceVersionDaoTest.java
===================================================================
RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/persistence/ResourceVersionDaoTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceVersionDaoTest.java	9 Oct 2006 20:46:44 -0000	1.1
--- ResourceVersionDaoTest.java	8 Apr 2007 19:51:06 -0000	1.2
***************
*** 23,27 ****
   * JUnit test case for testing ResourceVersionDao implementation.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version Revision$
   */
  public class ResourceVersionDaoTest extends SpringTestCase{
--- 23,27 ----
   * JUnit test case for testing ResourceVersionDao implementation.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version $Revision$
   */
  public class ResourceVersionDaoTest extends SpringTestCase{
***************
*** 30,34 ****
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{"classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  
--- 30,35 ----
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{
!       "classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  
***************
*** 104,108 ****
        for (int i=0; i<versions.size(); i++){
           foundVersion = (ResourceVersion)versions.get(i);
!          assertTrue("Found a correct ResourceVersion", "version1".equals(foundVersion.getName()) || "version2".equals(foundVersion.getName()));
        }
        versions = dao.getResourceVersionsByType(type2);
--- 105,110 ----
        for (int i=0; i<versions.size(); i++){
           foundVersion = (ResourceVersion)versions.get(i);
!          assertTrue("Found a correct ResourceVersion", "version1".equals(foundVersion.getName())
!                                                          || "version2".equals(foundVersion.getName()));
        }
        versions = dao.getResourceVersionsByType(type2);
***************
*** 111,115 ****
        for (int i=0; i<versions.size(); i++){
           foundVersion = (ResourceVersion)versions.get(i);
!          assertTrue("Found a correct ResourceVersion", "version3".equals(foundVersion.getName()) || "version4".equals(foundVersion.getName()));
        }
     }
--- 113,118 ----
        for (int i=0; i<versions.size(); i++){
           foundVersion = (ResourceVersion)versions.get(i);
!          assertTrue("Found a correct ResourceVersion", "version3".equals(foundVersion.getName())
!                                                          || "version4".equals(foundVersion.getName()));
        }
     }

Index: EnvironmentMappingDaoTest.java
===================================================================
RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/persistence/EnvironmentMappingDaoTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EnvironmentMappingDaoTest.java	25 Jul 2006 13:24:32 -0000	1.1
--- EnvironmentMappingDaoTest.java	8 Apr 2007 19:51:05 -0000	1.2
***************
*** 28,32 ****
   * JUnit test case for testing EnvironmentMappingDao implementation.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version Revision$
   */
  public class EnvironmentMappingDaoTest extends SpringTestCase{
--- 28,32 ----
   * JUnit test case for testing EnvironmentMappingDao implementation.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version $Revision$
   */
  public class EnvironmentMappingDaoTest extends SpringTestCase{
***************
*** 35,39 ****
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{"classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  
--- 35,40 ----
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{
!       "classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  

Index: ParameterDaoTest.java
===================================================================
RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/persistence/ParameterDaoTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParameterDaoTest.java	25 Jul 2006 13:24:32 -0000	1.1
--- ParameterDaoTest.java	8 Apr 2007 19:51:06 -0000	1.2
***************
*** 20,24 ****
   * JUnit test case for testing ParameterDao implementation.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version Revision$
   */
  public class ParameterDaoTest extends SpringTestCase{
--- 20,24 ----
   * JUnit test case for testing ParameterDao implementation.
   * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version $Revision$
   */
  public class ParameterDaoTest extends SpringTestCase{
***************
*** 27,31 ****
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{"classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  
--- 27,32 ----
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{
!       "classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"};
  
  

[Join-cvs] join1/src/test/org/figure8/join/businessobjects/artifact/persistence AssemblyDaoTest.java, 1.1, 1.2 DeliverableDaoTest.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/artifact/persistence
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16499/businessobjects/artifact/persistence

Modified Files:
	AssemblyDaoTest.java DeliverableDaoTest.java 
Log Message:
Fixing Checkstyle errors

Index: DeliverableDaoTest.java
===================================================================
RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/artifact/persistence/DeliverableDaoTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DeliverableDaoTest.java	25 Jul 2006 13:14:52 -0000	1.1
--- DeliverableDaoTest.java	8 Apr 2007 19:48:21 -0000	1.2
***************
*** 23,27 ****
  import java.util.Date;
  import java.util.List;
- import java.io.IOException;
  /**
   * JUnit test case for testing DeliverableDao implementation.
--- 23,26 ----
***************
*** 34,38 ****
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{"classpath:/org/figure8/join/businessobjects/artifact/persistence/spring.xml"};
  
  
--- 33,38 ----
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{
!       "classpath:/org/figure8/join/businessobjects/artifact/persistence/spring.xml"};
  
  

Index: AssemblyDaoTest.java
===================================================================
RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/artifact/persistence/AssemblyDaoTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AssemblyDaoTest.java	25 Jul 2006 13:14:52 -0000	1.1
--- AssemblyDaoTest.java	8 Apr 2007 19:48:21 -0000	1.2
***************
*** 18,22 ****
  import org.figure8.join.businessobjects.commons.Release;
  import org.figure8.join.businessobjects.commons.persistence.ReleaseDao;
- import org.figure8.join.businessobjects.artifact.persistence.AssemblyDao;
  import org.figure8.join.businessobjects.artifact.Assembly;
  import org.figure8.join.businessobjects.artifact.Deliverable;
--- 18,21 ----
***************
*** 36,40 ****
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{"classpath:/org/figure8/join/businessobjects/artifact/persistence/spring.xml"};
  
  
--- 35,40 ----
  
     /** Spring configuration files */
!    private String[] configLocations = new String[]{
!       "classpath:/org/figure8/join/businessobjects/artifact/persistence/spring.xml"};
  
  

[Join-cvs] join1/src/test/org/figure8/join/businessfacades/reporting ReportingManagerTest.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/test/org/figure8/join/businessfacades/reporting
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15793/businessfacades/reporting

Modified Files:
	ReportingManagerTest.java 
Log Message:
Fixing Checkstyle errors

Index: ReportingManagerTest.java
===================================================================
RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessfacades/reporting/ReportingManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReportingManagerTest.java	25 Jul 2006 13:10:37 -0000	1.1
--- ReportingManagerTest.java	8 Apr 2007 19:46:53 -0000	1.2
***************
*** 18,22 ****
  import org.figure8.join.businessobjects.commons.persistence.ReleaseDao;
  import org.figure8.join.businessobjects.reporting.Message;
- import org.figure8.join.businessobjects.reporting.persistence.MessageDao;
  import org.figure8.join.util.SpringTestCase;
  
--- 18,21 ----
***************
*** 94,99 ****
        Calendar sCal = Calendar.getInstance();
        sCal.add(Calendar.DAY_OF_YEAR, -3);
!       assertEquals("Messages are successfully retrieved", 4, reportingManager.getMessages(sCal.getTime(), expCal.getTime(), null).size());
!       assertEquals("Messages are successfully retrieved", 2, reportingManager.getMessages(sCal.getTime(), expCal.getTime(), release).size());
        // Assert there's still 2 open messages created.
        assertEquals("Messages are successfully created", 2, reportingManager.getOpenMessages(null).size());
--- 93,100 ----
        Calendar sCal = Calendar.getInstance();
        sCal.add(Calendar.DAY_OF_YEAR, -3);
!       assertEquals("Messages are successfully retrieved", 4, reportingManager.getMessages(sCal.getTime(),
!                                                                                  expCal.getTime(), null).size());
!       assertEquals("Messages are successfully retrieved", 2, reportingManager.getMessages(sCal.getTime(),
!                                                                                  expCal.getTime(), release).size());
        // Assert there's still 2 open messages created.
        assertEquals("Messages are successfully created", 2, reportingManager.getOpenMessages(null).size());

[Join-cvs] join1/src/resources/WEB-INF web.xml,1.3,1.4

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/resources/WEB-INF
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14489

Modified Files:
	web.xml 
Log Message:
Fix filter object for security constraints + add gobal exception handling

Index: web.xml
===================================================================
RCS file: /cvsroot/join/join1/src/resources/WEB-INF/web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** web.xml	28 Feb 2007 23:59:26 -0000	1.3
--- web.xml	8 Apr 2007 19:44:21 -0000	1.4
***************
*** 31,35 ****
        <init-param>
           <param-name>failurePage</param-name>
!          <param-value>/jsp/authorizationfailure.jsp</param-value>
        </init-param>
     </filter>
--- 31,35 ----
        <init-param>
           <param-name>failurePage</param-name>
!          <param-value>/pages/authorizationfailurepage.jsp</param-value>
        </init-param>
     </filter>
***************
*** 46,56 ****
        </init-param>
     </filter>
!    
!    <!--
     <filter-mapping>
        <filter-name>AccessControlFilter</filter-name>
        <url-pattern>/action/*</url-pattern>
     </filter-mapping>
-    -->
     <filter-mapping>
        <filter-name>SessionInViewFilter</filter-name>
--- 46,54 ----
        </init-param>
     </filter>
! 
     <filter-mapping>
        <filter-name>AccessControlFilter</filter-name>
        <url-pattern>/action/*</url-pattern>
     </filter-mapping>
     <filter-mapping>
        <filter-name>SessionInViewFilter</filter-name>

[Join-cvs] join1/src/resources/properties gui_en_US.properties, 1.5, 1.6 gui_es_ES.properties, 1.4, 1.5 gui_fr_FR.properties, 1.4, 1.5 help_en_US.properties, 1.4, 1.5 help_es_ES.properties, 1.3, 1.4 help_fr_FR.properties, 1.3, 1.4

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/resources/properties
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13174

Modified Files:
	gui_en_US.properties gui_es_ES.properties gui_fr_FR.properties 
	help_en_US.properties help_es_ES.properties 
	help_fr_FR.properties 
Log Message:
Add new gui labels

Index: help_fr_FR.properties
===================================================================
RCS file: /cvsroot/join/join1/src/resources/properties/help_fr_FR.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** help_fr_FR.properties	11 Jan 2007 21:22:18 -0000	1.3
--- help_fr_FR.properties	8 Apr 2007 19:42:15 -0000	1.4
***************
*** 46,50 ****
  help.setup.finish=Installation de Join Terminée
  help.setup.finish.text=L'installation standard de Join vient de se terminer avec succès ! L'administrateur est actuellement loggè.
! help.setup.finish.link=Vous pouvez maintenant utiliser <a href="/">l'assistant</a> pour param&#232;trer Join pour votre projet.
  
  help.gateway.tracking=Cette page pr&#233;sente les changements de configuration (liaisons aux <b>syst&#232;mes d'informations</b> et leurs <b>versions</b>) survenus durant la p&#233riode s&#233lectionn&#233e. Ces changements sont class&#233;s par type de <b>SI</b>.
--- 46,50 ----
  help.setup.finish=Installation de Join Termin&#233;e
  help.setup.finish.text=L'installation standard de Join vient de se terminer avec succ&#232;s ! L'administrateur est actuellement logg&#232;.
! help.setup.finish.link=Vous pouvez maintenant utiliser le <a href="{0}">portail</a> pour param&#232;trer Join pour votre projet.
  
  help.gateway.tracking=Cette page pr&#233;sente les changements de configuration (liaisons aux <b>syst&#232;mes d'informations</b> et leurs <b>versions</b>) survenus durant la p&#233riode s&#233lectionn&#233e. Ces changements sont class&#233;s par type de <b>SI</b>.

Index: help_es_ES.properties
===================================================================
RCS file: /cvsroot/join/join1/src/resources/properties/help_es_ES.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** help_es_ES.properties	11 Jan 2007 21:22:02 -0000	1.3
--- help_es_ES.properties	8 Apr 2007 19:42:15 -0000	1.4
***************
*** 47,51 ****
  help.setup.finish=Join Setup Complete
  help.setup.finish.text=Join has now been installed successfully using the standard way ! Administrator is now logged in.
! help.setup.finish.link=You may want to use the <a href="/">wizard</a> to customize Join for your project.
  
  help.gateway.tracking=This page displays configuration changes (bindings of <b>information systems</b> and their <b>version</b>) during the selected time period. Changes are sorted by <b>IS</b> type.
--- 47,51 ----
  help.setup.finish=Join Setup Complete
  help.setup.finish.text=Join has now been installed successfully using the standard way ! Administrator is now logged in.
! help.setup.finish.link=You may now use the <a href="{0}">portail</a> to customize Join for your project.
  
  help.gateway.tracking=This page displays configuration changes (bindings of <b>information systems</b> and their <b>version</b>) during the selected time period. Changes are sorted by <b>IS</b> type.

Index: gui_fr_FR.properties
===================================================================
RCS file: /cvsroot/join/join1/src/resources/properties/gui_fr_FR.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gui_fr_FR.properties	28 Feb 2007 23:56:21 -0000	1.4
--- gui_fr_FR.properties	8 Apr 2007 19:42:15 -0000	1.5
***************
*** 263,266 ****
--- 263,267 ----
  
  title.envmapping.new=Nouveau lien
+ title.envmapping.close=Fermer ce lien
  title.envmapping.current=Lien actuel
  title.envmapping.creation=Cr&#233;ation de lien
***************
*** 422,427 ****
  label.global.validation.error=Erreur(s) de saisie
  label.global.authorization.error=Vous ne pouvez acc&#233;der à cette ressource
! label.global.service.error=Ce service est momentann&#233;ment indisponible
! label.global.service2.error=Contactez l'<a href="mailto:{0}">administrateur</a> si le probl&#232;me persiste
  label.global.duplicate.error=Un objet avec des propri&#233;t&#233;s similaires existe d&#233;j&#224; dans l'application
  label.global.notallowed.error=Cette op&#233;ration n'est pas permise maintenant. Voici la raison
--- 423,428 ----
  label.global.validation.error=Erreur(s) de saisie
  label.global.authorization.error=Vous ne pouvez acc&#233;der à cette ressource
! label.global.service.error=Ce service est momentan&#233;ment indisponible
! label.global.service.error.details=D&#233;tails de l'erreur
  label.global.duplicate.error=Un objet avec des propri&#233;t&#233;s similaires existe d&#233;j&#224; dans l'application
  label.global.notallowed.error=Cette op&#233;ration n'est pas permise maintenant. Voici la raison

Index: gui_en_US.properties
===================================================================
RCS file: /cvsroot/join/join1/src/resources/properties/gui_en_US.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gui_en_US.properties	28 Feb 2007 23:56:21 -0000	1.5
--- gui_en_US.properties	8 Apr 2007 19:42:15 -0000	1.6
***************
*** 263,266 ****
--- 263,267 ----
  
  title.envmapping.new=New mapping
+ title.envmapping.close=Close this mapping
  title.envmapping.current=Current mapping
  title.envmapping.creation=Mapping creation
***************
*** 420,424 ****
  label.global.authorization.error=Your are not authorized to access this resource
  label.global.service.error=This service is unavailable for the moment
! label.global.service2.error=Contact your <a href="mailto:{0}">system admin</a> if problem persists
  label.global.duplicate.error=An object with similar properties already exists in application
  label.global.notallowed.error=This operation is not allowed now. Here is the reason
--- 421,425 ----
  label.global.authorization.error=Your are not authorized to access this resource
  label.global.service.error=This service is unavailable for the moment
! label.global.service.error.details=Exception details
  label.global.duplicate.error=An object with similar properties already exists in application
  label.global.notallowed.error=This operation is not allowed now. Here is the reason

Index: gui_es_ES.properties
===================================================================
RCS file: /cvsroot/join/join1/src/resources/properties/gui_es_ES.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gui_es_ES.properties	28 Feb 2007 23:56:21 -0000	1.4
--- gui_es_ES.properties	8 Apr 2007 19:42:15 -0000	1.5
***************
*** 259,262 ****
--- 259,263 ----
  
  title.envmapping.new=Nuevo enlace
+ title.envmapping.close=Close this mapping
  title.envmapping.current=Enlace actual
  title.envmapping.creation=Creaci&#243;n de un enlace
***************
*** 417,421 ****
  label.global.authorization.error=No tiene usted acceso a dicho recurso
  label.global.service.error=Dicho servicio está momentaneámente indisponible
! label.global.service2.error=Contacte usted el <a href="mailto:{0}">administrador/a> si persite el problema
  label.global.duplicate.error=Un objeto con propriedades similares ya existe en la aplicaci&#243;n
  label.global.notallowed.error=This operation is not allowed now. Here is the reason
--- 418,422 ----
  label.global.authorization.error=No tiene usted acceso a dicho recurso
  label.global.service.error=Dicho servicio está momentaneámente indisponible
! label.global.service.error.details=Exception details
  label.global.duplicate.error=Un objeto con propriedades similares ya existe en la aplicaci&#243;n
  label.global.notallowed.error=This operation is not allowed now. Here is the reason

Index: help_en_US.properties
===================================================================
RCS file: /cvsroot/join/join1/src/resources/properties/help_en_US.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** help_en_US.properties	11 Jan 2007 21:21:56 -0000	1.4
--- help_en_US.properties	8 Apr 2007 19:42:15 -0000	1.5
***************
*** 46,50 ****
  help.setup.finish=Join Setup Complete
  help.setup.finish.text=Join has now been installed successfully using the standard way ! Administrator is now logged in.
! help.setup.finish.link=You may want to use the <a href="/">wizard</a> to customize Join for your project.
  
  help.gateway.tracking=This page displays configuration changes (bindings of <b>information systems</b> and their <b>version</b>) during the selected time period. Changes are sorted by <b>IS</b> type.
--- 46,50 ----
  help.setup.finish=Join Setup Complete
  help.setup.finish.text=Join has now been installed successfully using the standard way ! Administrator is now logged in.
! help.setup.finish.link=You may now use the <a href="{0}">portail</a> to customize Join for your project.
  
  help.gateway.tracking=This page displays configuration changes (bindings of <b>information systems</b> and their <b>version</b>) during the selected time period. Changes are sorted by <b>IS</b> type.

[Join-cvs] join1/src/main/org/figure8/join/util UnixCrypt.java, 1.2, 1.3

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/util
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10217/util

Modified Files:
	UnixCrypt.java 
Log Message:
Fixing Checkstyle errors

Index: UnixCrypt.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/util/UnixCrypt.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UnixCrypt.java	18 Jul 2006 21:41:50 -0000	1.2
--- UnixCrypt.java	8 Apr 2007 19:34:17 -0000	1.3
***************
*** 17,21 ****
  /**
   * Unix Crypt. Implements the one way cryptography used by Unix systems for
!  * simple password protection. This classhas been extracted from
   * <a href="http://jetty.mortbay.org">Jetty</a> package.<br/>
   *
--- 17,21 ----
  /**
   * Unix Crypt. Implements the one way cryptography used by Unix systems for
!  * simple password protection. This class has been extracted from
   * <a href="http://jetty.mortbay.org">Jetty</a> package.<br/>
   *
***************
*** 26,30 ****
   * provided that this copyright notice appears in all copies.
   *
!  * @version 0.9, 11/25/96
   * @author Aki Yoshida
   *
--- 26,30 ----
   * provided that this copyright notice appears in all copies.
   *
!  * @version 0.9, 11/25/96 - $Revision$
   * @author Aki Yoshida
   *

[Join-cvs] join1/src/main/org/figure8/join/services/scripting/ant/tasks RemoteServiceTask.java, 1.1, 1.2 SubstituteParametersTask.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/services/scripting/ant/tasks
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9317/services/scripting/ant/tasks

Modified Files:
	RemoteServiceTask.java SubstituteParametersTask.java 
Log Message:
Update deprecated usages

Index: RemoteServiceTask.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/services/scripting/ant/tasks/RemoteServiceTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RemoteServiceTask.java	7 Jul 2006 22:10:15 -0000	1.1
--- RemoteServiceTask.java	8 Apr 2007 19:31:44 -0000	1.2
***************
*** 100,109 ****
     protected AuthenticatedService retrieveRemoteService(String name, Class serviceClass) throws BuildException{
        // Retrieve url from project properties, from system property or from task attributes.
!       String connectionUrl = project.getUserProperty(JoinTask.URL_PROPERTY);
        if (connectionUrl == null) connectionUrl = System.getProperty(JoinTask.URL_PROPERTY);
        if (connectionUrl == null) connectionUrl = url;
        // Check we really have an url.
        if (connectionUrl == null || connectionUrl.length() == 0)
!          throw new BuildException("No url found for connecting to remote " + name + " service", location);
  
        // Retrieve the authenticated service.
--- 100,109 ----
     protected AuthenticatedService retrieveRemoteService(String name, Class serviceClass) throws BuildException{
        // Retrieve url from project properties, from system property or from task attributes.
!       String connectionUrl = getProject().getUserProperty(JoinTask.URL_PROPERTY);
        if (connectionUrl == null) connectionUrl = System.getProperty(JoinTask.URL_PROPERTY);
        if (connectionUrl == null) connectionUrl = url;
        // Check we really have an url.
        if (connectionUrl == null || connectionUrl.length() == 0)
!          throw new BuildException("No url found for connecting to remote " + name + " service", getLocation());
  
        // Retrieve the authenticated service.
***************
*** 120,124 ****
           log("Exception while connecting to remote service using " + connectionUrl, Project.MSG_ERR);
           log("Exception detailed message is: " + e.getMessage(), Project.MSG_ERR);
!          throw new BuildException("Exception while connecting to remote service", e, location);
        }
        return service;
--- 120,124 ----
           log("Exception while connecting to remote service using " + connectionUrl, Project.MSG_ERR);
           log("Exception detailed message is: " + e.getMessage(), Project.MSG_ERR);
!          throw new BuildException("Exception while connecting to remote service", e, getLocation());
        }
        return service;
***************
*** 140,144 ****
     protected String loginToRemoteService(AuthenticatedService service) throws InvalidLoginException, RemoteException{
        // First check if there's a secutiry token.
!       String token = project.getUserProperty(JoinTask.SECURITY_TOKEN);
  
        if (token == null){
--- 140,144 ----
     protected String loginToRemoteService(AuthenticatedService service) throws InvalidLoginException, RemoteException{
        // First check if there's a secutiry token.
!       String token = getProject().getUserProperty(JoinTask.SECURITY_TOKEN);
  
        if (token == null){
***************
*** 153,157 ****
           // Check we really have user/password pair.
           if (connectionUser == null || connectionPwd == null)
!             throw new BuildException("No user or password for login to the remote AuthenticatedService", location);
  
           // Login onto remote service.
--- 153,157 ----
           // Check we really have user/password pair.
           if (connectionUser == null || connectionPwd == null)
!             throw new BuildException("No user or password for login to the remote AuthenticatedService", getLocation());
  
           // Login onto remote service.
***************
*** 172,176 ****
     protected void releaseRemoteService(AuthenticatedService service, String token){
        // First check if there's a secutiry token in context.
!       String ctxToken = project.getUserProperty(JoinTask.SECURITY_TOKEN);
  
        if (ctxToken == null || !ctxToken.equals(token)){
--- 172,176 ----
     protected void releaseRemoteService(AuthenticatedService service, String token){
        // First check if there's a secutiry token in context.
!       String ctxToken = getProject().getUserProperty(JoinTask.SECURITY_TOKEN);
  
        if (ctxToken == null || !ctxToken.equals(token)){

Index: SubstituteParametersTask.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/services/scripting/ant/tasks/SubstituteParametersTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SubstituteParametersTask.java	7 Jul 2006 22:10:15 -0000	1.1
--- SubstituteParametersTask.java	8 Apr 2007 19:31:44 -0000	1.2
***************
*** 191,208 ****
        // Check that environmentKey is present.
        if (environmentKey == null || environmentKey.length() == 0)
!          throw new BuildException("No environment key specified for substituteParameters", location);
        // Check that targetName is present.
        if (targetName == null || targetName.length() == 0)
!          throw new BuildException("No deployment target specified for substituteParameters", location);
        // Check that destination dir is present.
        if (toDir == null || toDir.length() == 0)
!          throw new BuildException("No destination directory specified for substituteParameters", location);
        // Check that destination dir is existing.
        destinationDir = new File(toDir);
        if (!destinationDir.isDirectory())
!          throw new BuildException("The destination directory specified is not a valid directory", location);
        // Check that there's at least one fileset.
        if (fileSets.isEmpty())
!          throw new BuildException("No FileSet specified for substituteParameters", location);
     }
  
--- 191,208 ----
        // Check that environmentKey is present.
        if (environmentKey == null || environmentKey.length() == 0)
!          throw new BuildException("No environment key specified for substituteParameters", getLocation());
        // Check that targetName is present.
        if (targetName == null || targetName.length() == 0)
!          throw new BuildException("No deployment target specified for substituteParameters", getLocation());
        // Check that destination dir is present.
        if (toDir == null || toDir.length() == 0)
!          throw new BuildException("No destination directory specified for substituteParameters", getLocation());
        // Check that destination dir is existing.
        destinationDir = new File(toDir);
        if (!destinationDir.isDirectory())
!          throw new BuildException("The destination directory specified is not a valid directory", getLocation());
        // Check that there's at least one fileset.
        if (fileSets.isEmpty())
!          throw new BuildException("No FileSet specified for substituteParameters", getLocation());
     }
  
***************
*** 228,242 ****
           // Log diagnostic messages and wrap into a BuildException.
           log("InvalidLoginException while logging to remote service: " + ile.getMessage(), Project.MSG_ERR);
!          throw new BuildException("Exception while logging to remote service", ile, location);
        }
        catch (InvalidSessionException ise){
           // Log diagnostic messages and wrap into a BuildException.
           log("InvalidSessionException while invoking remote service: " + ise.getMessage(), Project.MSG_ERR);
!          throw new BuildException("Exception while invoking remote service", ise, location);
        }
        catch (RemoteException re){
           // Log diagnostic messages and wrap into a BuildException.
           log("RemoteException while logging to remote service: " + re.getMessage(), Project.MSG_ERR);
!          throw new BuildException("Exception while logging to remote service", re, location);
        }
        // Release service and return.
--- 228,242 ----
           // Log diagnostic messages and wrap into a BuildException.
           log("InvalidLoginException while logging to remote service: " + ile.getMessage(), Project.MSG_ERR);
!          throw new BuildException("Exception while logging to remote service", ile, getLocation());
        }
        catch (InvalidSessionException ise){
           // Log diagnostic messages and wrap into a BuildException.
           log("InvalidSessionException while invoking remote service: " + ise.getMessage(), Project.MSG_ERR);
!          throw new BuildException("Exception while invoking remote service", ise, getLocation());
        }
        catch (RemoteException re){
           // Log diagnostic messages and wrap into a BuildException.
           log("RemoteException while logging to remote service: " + re.getMessage(), Project.MSG_ERR);
!          throw new BuildException("Exception while logging to remote service", re, getLocation());
        }
        // Release service and return.
***************
*** 258,264 ****
        for (int i=0; i<fileSets.size(); i++){
           FileSet set = (FileSet)fileSets.get(i);
!          DirectoryScanner scanner = set.getDirectoryScanner(project);
  
!          File sourceDir = set.getDir(project);
           String[] fileNames = scanner.getIncludedFiles();
  
--- 258,264 ----
        for (int i=0; i<fileSets.size(); i++){
           FileSet set = (FileSet)fileSets.get(i);
!          DirectoryScanner scanner = set.getDirectoryScanner(getProject());
  
!          File sourceDir = set.getDir(getProject());
           String[] fileNames = scanner.getIncludedFiles();
  
***************
*** 293,297 ****
           finally{
              try {writer.close();}
!             catch (Exception e) {}
           }
  
--- 293,297 ----
           finally{
              try {writer.close();}
!             catch (Exception e) {log("Exception while closing writer", Project.MSG_DEBUG);}
           }
  
***************
*** 354,360 ****
        finally{
           try {writer.close();}
!          catch (Exception e) {}
           try {reader.close();}
!          catch (Exception e) {}
        }
        // Return messages.
--- 354,360 ----
        finally{
           try {writer.close();}
!          catch (Exception e) {log("Exception while closing writer", Project.MSG_DEBUG);}
           try {reader.close();}
!          catch (Exception e) {log("Exception while closing reader", Project.MSG_DEBUG);}
        }
        // Return messages.

[Join-cvs] join1/src/site/xdocs/images deployment1.png, NONE, 1.1 deploymentdiag1.png, NONE, 1.1 deploymentdiag2.png, NONE, 1.1 deploymentdiag3.png, NONE, 1.1

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/site/xdocs/images
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8387/xdocs/images

Added Files:
	deployment1.png deploymentdiag1.png deploymentdiag2.png 
	deploymentdiag3.png 
Log Message:
Adding images to documentation

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

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

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

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

[Join-cvs] join1/src/main/org/figure8/join/services/repository VFSRepository.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/services/repository
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30460/services/repository

Modified Files:
	VFSRepository.java 
Log Message:
Fixing Checkstyle errors

Index: VFSRepository.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/services/repository/VFSRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VFSRepository.java	7 Jul 2006 21:04:13 -0000	1.1
--- VFSRepository.java	8 Apr 2007 19:03:55 -0000	1.2
***************
*** 1,288 ****
! /**
!  * Copyright 2005-2006 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.services.repository;
! 
! import org.figure8.join.businessobjects.artifact.Artifact;
! import org.figure8.join.util.LogUtil;
! 
! import org.apache.commons.vfs.VFS;
! import org.apache.commons.vfs.FileType;
! import org.apache.commons.vfs.FileObject;
! import org.apache.commons.vfs.FileSelector;
! import org.apache.commons.vfs.FileSelectInfo;
! import org.apache.commons.vfs.FileSystemManager;
! import org.apache.commons.vfs.FileSystemException;
! import org.apache.commons.logging.Log;
! 
! import java.io.File;
! import java.io.InputStream;
! import java.io.OutputStream;
! import java.io.FileInputStream;
! /**
!  * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version $Revision$
!  */
! public class VFSRepository extends AbstractStructuredRepository{
! 
!    // Static -------------------------------------------------------------------
!    
!    /** Get a commons logger. */
!    private static final Log log = LogUtil.getLog(VFSRepository.class);
!    
!    
!    // Attributes ---------------------------------------------------------------
! 
!    /** String representation of the repository base url */
!    private String baseUrl = null;
!    
!    
!    // Constructors -------------------------------------------------------------
! 
!    /** Creates a new instance of VFSRepository. */
!    public VFSRepository(){
!    }
!    
! 
!    // Public -------------------------------------------------------------------
!    
!    /**
!     * Get the base url (string representation) of the physical repository to access
!     * @return The base url of the repository
!     */
!    public String getBaseUrl(){
!       return baseUrl;
!    }
!    /**
!     * Set the base url (string representation) of the physical repository to access
!     * @param baseUrl The base url of the repository
!     */   
!    public void setBaseUrl(String baseUrl){
!       if (!baseUrl.endsWith("/"))
!          baseUrl += "/";
!       this.baseUrl = baseUrl;
!    }
!    
!    
!    // Implementation of Repository ---------------------------------------------
! 
!    /**
!     * Retrieve the input stream corresponding to a given Artifact. This
!     * method can be used for artifact content downloading or retrieval.
!     * @param artifact The domain object representing artifact to retrieve
!     * @return An {@code InputStream} on artifact content
!     * @throws ConnectionException if physical repository cannot be connected
!     * @throws TransferException if something wrong occur after connection, during transfer
!     */
!    public InputStream getArtifact(Artifact artifact) throws ConnectionException, TransferException{
!       log.info("Retrieving stream of artifact with id: " + artifact.getUniqueId());
!       // Get structure path for artifact.
!       String structurePath = getStructurePath(artifact);
!       if (!structurePath.endsWith("/"))
!          structurePath += "/";
!       
!       // Build a path for target file.
!       String target = baseUrl + structurePath;
!       // We don't know file name (it may have an extension or not), so list them ...
!       FileObject[] files = null;
!       try{
!          FileSystemManager fsManager = VFS.getManager();
!          FileObject parentDir = fsManager.resolveFile(structurePath);
!          parentDir.findFiles(getArtifactFileSelector(artifact));
!       }
!       catch (FileSystemException fse){
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while resolving the file into repository: " + target);
!          throw new ConnectionException("Exception while resolving target file into repository", fse);
!       }
!       // Repository should contain only one valid file.
!       if (files == null || files.length == 0){
!          log.error("There's no file coresponding to artifact " + artifact.getUniqueId());
!          throw new ConnectionException("Repository is in an unsafe state",
!                  new IllegalStateException("No file available for artifact"));
!       }
!       FileObject artifactFile = files[0];
!       try{
!          // Check it is a file (not a directory).
!          if (!artifactFile.getType().equals(FileType.FILE)){
!             log.error("ArtifactFile is not a valid file: " + artifactFile.getName().toString());
!             throw new ConnectionException("Repository is in an unsafe state",
!                     new IllegalStateException("No valid file for artifact"));
!          }
!          // Check it is readable.
!          if (!artifactFile.isReadable()){
!             log.error("ArtifactFile is not a readable file: " + artifactFile.getName().toString());
!             throw new ConnectionException("Repository is in an unsafe state",
!                     new IllegalStateException("File for artifact not readable"));
!          }
!       }
!       catch (FileSystemException fse){
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while accessing the properties of file: " + artifactFile.getName().toString());
!          throw new ConnectionException("Exception while accessing the properties of artifact file", fse);
!       }
!       try{
!          // Return input stream on artifact file content.
!          return artifactFile.getContent().getInputStream();
!       }
!       catch (Exception e){
!          // Log and wrap this into a TransferException.
!          log.error("Exception while creating input stream onto file " + artifactFile.getName().toString());
!          throw new TransferException("Exception while creating input stream on artifact", e);
!       }
!    }
! 
!    /**
!     * Store the content of a given Artifact within repository datastore.
!     * @param artifact The domain object representing artifact to store
!     * @param content File representing artifact content (may be a directory)
!     * @throws ConnectionException if physical repository cannot be connected
!     * @throws TransferException if something wrong occur after connection, during transfer
!     */
!    public void storeArtifact(Artifact artifact, File content) throws ConnectionException, TransferException{
!       log.info("Storing file of artifact with id: " + artifact.getUniqueId());
!       // Get structure path for artifact.
!       String structurePath = getStructurePath(artifact);
!       if (!structurePath.endsWith("/"))
!          structurePath += "/";
!       
!       // Build a path for target file.
!       String target = baseUrl + structurePath;
!       if (content.getName().lastIndexOf(".") != -1){
!          // If there's extension, concat to artifact id.
!          target += artifact.getUniqueId() + content.getName().substring(content.getName().lastIndexOf("."));
!          log.debug("Content has an extension. Target path is " + target);
!       }
!       else{
!          // If no extension, file name = identifier.
!          target += artifact.getUniqueId();
!          log.debug("Content has no extension. Target path is " + target);
!       }
! 
!       // Resolve destination file.
!       FileObject dest = null;
!       try{
!          FileSystemManager fsManager = VFS.getManager();
!          dest = fsManager.resolveFile(target);
!       }
!       catch (FileSystemException fse){
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while resolving the file into repository: " + target);
!          throw new ConnectionException("Exception while resolving target file into repository", fse);
!       }
! 
!       // Create an input and output streams for writing file.
!       OutputStream os = null;
!       FileInputStream contentFis = null;
!       try{
!          os = dest.getContent().getOutputStream();
!          contentFis = new FileInputStream(content);
!       }
!       catch (Exception e){
!          e.printStackTrace();
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while opening copy streams into repository for: " + target);
!          throw new ConnectionException("Exception while opening copy streams into repository", e);
!       }
!       writeStream(contentFis, os);
!    }
!    
!    /**
!     * Store the content of a given Artifact within repository datastore using an input stream.
!     * @param artifact The domain object representing artifact to store
!     * @param is InputStream on artifact content
!     * @throws ConnectionException if physical repository cannot be connected
!     * @throws TransferException if something wrong occur after connection, during transfer
!     */
!    public void storeArtifact(Artifact artifact, InputStream is) throws ConnectionException, TransferException{
!       log.info("Storing stream of artifact with id: " + artifact.getUniqueId());
!       // Get structure path for artifact.
!       String structurePath = getStructurePath(artifact);
!       if (!structurePath.endsWith("/"))
!          structurePath += "/";
! 
!       // Build a path for target file.
!       String target = baseUrl + structurePath + artifact.getUniqueId();
!       log.debug("Content is an InputStream. Target file path is " + target);
! 
!       // Resolve destination file.
!       FileObject dest = null;
!       try{
!          FileSystemManager fsManager = VFS.getManager();
!          dest = fsManager.resolveFile(target);
!       }
!       catch (FileSystemException fse){
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while resolving the file into repository: " + target);
!          throw new ConnectionException("Exception while resolving target file into repository", fse);
!       }
! 
!       // Create an input and output streams for writing file.
!       OutputStream os = null;
!       try {os = dest.getContent().getOutputStream();}
!       catch (Exception e){
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while opening copy streams into repository for: " + target);
!          throw new ConnectionException("Exception while opening copy streams into repository", e);
!       }
!       writeStream(is, os);
!    }
! 
! 
!    // Private ------------------------------------------------------------------
! 
!    /**
!     * Write an input stream content to a target output stream. This method closes
!     * the input and output streams at the end of write operation.
!     * @param is The input stream to use for getting data
!     * @param os The output stream to use for writing data
!     * @throws TransferException if an IOException occurs during writing output
!     */
!    private void writeStream(InputStream is, OutputStream os) throws TransferException{
!       try{
!          // Read is and write on fos unsing a buffer of bytes.
!          int bytes = 0;
!          byte[] buffer = new byte[8192];
!          while ((bytes = is.read(buffer, 0, 8192)) != -1)
!             os.write(buffer, 0, bytes);
!       }
!       catch (Exception e){
!          // Log and wrap IOException into a transfer exception.
!          log.error("IOException while writing into stream: " + os);
!          throw new TransferException("IOException while writing into target stream", e);
!       }
!       finally{
!          try {is.close();}
!          catch (Exception e) {/* Do nothing here... */}
!          try {os.close();}
!          catch (Exception e) {/* Do nothing here... */}
!       }
!    }
! 
!    /**
!     * Get a FileSelector implementation for filtering files
!     * corresponding to artifact.
!     * @return A FileSelector for artifact
!     */
!    private FileSelector getArtifactFileSelector(final Artifact artifact){
!       return new FileSelector(){
!          public boolean includeFile(FileSelectInfo info){
!             return info.getFile().getName().getBaseName().startsWith(artifact.getUniqueId());
!          }
!          public boolean traverseDescendents(FileSelectInfo info){
!             return false;
!          }
!       };
!    }
! }
--- 1,289 ----
! /**
!  * Copyright 2005-2006 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.services.repository;
! 
! import org.figure8.join.businessobjects.artifact.Artifact;
! import org.figure8.join.util.LogUtil;
! 
! import org.apache.commons.vfs.VFS;
! import org.apache.commons.vfs.FileType;
! import org.apache.commons.vfs.FileObject;
! import org.apache.commons.vfs.FileSelector;
! import org.apache.commons.vfs.FileSelectInfo;
! import org.apache.commons.vfs.FileSystemManager;
! import org.apache.commons.vfs.FileSystemException;
! import org.apache.commons.logging.Log;
! 
! import java.io.File;
! import java.io.InputStream;
! import java.io.OutputStream;
! import java.io.FileInputStream;
! /**
!  * This is an implementation of {@link Repository} using Jakarta VFS Commons.
!  * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a>
!  * @version $Revision$
!  */
! public class VFSRepository extends AbstractStructuredRepository{
! 
!    // Static -------------------------------------------------------------------
!    
!    /** Get a commons logger. */
!    private static final Log log = LogUtil.getLog(VFSRepository.class);
!    
!    
!    // Attributes ---------------------------------------------------------------
! 
!    /** String representation of the repository base url */
!    private String baseUrl = null;
!    
!    
!    // Constructors -------------------------------------------------------------
! 
!    /** Creates a new instance of VFSRepository. */
!    public VFSRepository(){
!    }
!    
! 
!    // Public -------------------------------------------------------------------
!    
!    /**
!     * Get the base url (string representation) of the physical repository to access
!     * @return The base url of the repository
!     */
!    public String getBaseUrl(){
!       return baseUrl;
!    }
!    /**
!     * Set the base url (string representation) of the physical repository to access
!     * @param baseUrl The base url of the repository
!     */   
!    public void setBaseUrl(String baseUrl){
!       if (!baseUrl.endsWith("/"))
!          baseUrl += "/";
!       this.baseUrl = baseUrl;
!    }
!    
!    
!    // Implementation of Repository ---------------------------------------------
! 
!    /**
!     * Retrieve the input stream corresponding to a given Artifact. This
!     * method can be used for artifact content downloading or retrieval.
!     * @param artifact The domain object representing artifact to retrieve
!     * @return An {@code InputStream} on artifact content
!     * @throws ConnectionException if physical repository cannot be connected
!     * @throws TransferException if something wrong occur after connection, during transfer
!     */
!    public InputStream getArtifact(Artifact artifact) throws ConnectionException, TransferException{
!       log.info("Retrieving stream of artifact with id: " + artifact.getUniqueId());
!       // Get structure path for artifact.
!       String structurePath = getStructurePath(artifact);
!       if (!structurePath.endsWith("/"))
!          structurePath += "/";
!       
!       // Build a path for target file.
!       String target = baseUrl + structurePath;
!       // We don't know file name (it may have an extension or not), so list them ...
!       FileObject[] files = null;
!       try{
!          FileSystemManager fsManager = VFS.getManager();
!          FileObject parentDir = fsManager.resolveFile(structurePath);
!          parentDir.findFiles(getArtifactFileSelector(artifact));
!       }
!       catch (FileSystemException fse){
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while resolving the file into repository: " + target);
!          throw new ConnectionException("Exception while resolving target file into repository", fse);
!       }
!       // Repository should contain only one valid file.
!       if (files == null || files.length == 0){
!          log.error("There's no file coresponding to artifact " + artifact.getUniqueId());
!          throw new ConnectionException("Repository is in an unsafe state",
!                  new IllegalStateException("No file available for artifact"));
!       }
!       FileObject artifactFile = files[0];
!       try{
!          // Check it is a file (not a directory).
!          if (!artifactFile.getType().equals(FileType.FILE)){
!             log.error("ArtifactFile is not a valid file: " + artifactFile.getName().toString());
!             throw new ConnectionException("Repository is in an unsafe state",
!                     new IllegalStateException("No valid file for artifact"));
!          }
!          // Check it is readable.
!          if (!artifactFile.isReadable()){
!             log.error("ArtifactFile is not a readable file: " + artifactFile.getName().toString());
!             throw new ConnectionException("Repository is in an unsafe state",
!                     new IllegalStateException("File for artifact not readable"));
!          }
!       }
!       catch (FileSystemException fse){
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while accessing the properties of file: " + artifactFile.getName().toString());
!          throw new ConnectionException("Exception while accessing the properties of artifact file", fse);
!       }
!       try{
!          // Return input stream on artifact file content.
!          return artifactFile.getContent().getInputStream();
!       }
!       catch (Exception e){
!          // Log and wrap this into a TransferException.
!          log.error("Exception while creating input stream onto file " + artifactFile.getName().toString());
!          throw new TransferException("Exception while creating input stream on artifact", e);
!       }
!    }
! 
!    /**
!     * Store the content of a given Artifact within repository datastore.
!     * @param artifact The domain object representing artifact to store
!     * @param content File representing artifact content (may be a directory)
!     * @throws ConnectionException if physical repository cannot be connected
!     * @throws TransferException if something wrong occur after connection, during transfer
!     */
!    public void storeArtifact(Artifact artifact, File content) throws ConnectionException, TransferException{
!       log.info("Storing file of artifact with id: " + artifact.getUniqueId());
!       // Get structure path for artifact.
!       String structurePath = getStructurePath(artifact);
!       if (!structurePath.endsWith("/"))
!          structurePath += "/";
!       
!       // Build a path for target file.
!       String target = baseUrl + structurePath;
!       if (content.getName().lastIndexOf(".") != -1){
!          // If there's extension, concat to artifact id.
!          target += artifact.getUniqueId() + content.getName().substring(content.getName().lastIndexOf("."));
!          log.debug("Content has an extension. Target path is " + target);
!       }
!       else{
!          // If no extension, file name = identifier.
!          target += artifact.getUniqueId();
!          log.debug("Content has no extension. Target path is " + target);
!       }
! 
!       // Resolve destination file.
!       FileObject dest = null;
!       try{
!          FileSystemManager fsManager = VFS.getManager();
!          dest = fsManager.resolveFile(target);
!       }
!       catch (FileSystemException fse){
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while resolving the file into repository: " + target);
!          throw new ConnectionException("Exception while resolving target file into repository", fse);
!       }
! 
!       // Create an input and output streams for writing file.
!       OutputStream os = null;
!       FileInputStream contentFis = null;
!       try{
!          os = dest.getContent().getOutputStream();
!          contentFis = new FileInputStream(content);
!       }
!       catch (Exception e){
!          e.printStackTrace();
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while opening copy streams into repository for: " + target);
!          throw new ConnectionException("Exception while opening copy streams into repository", e);
!       }
!       writeStream(contentFis, os);
!    }
!    
!    /**
!     * Store the content of a given Artifact within repository datastore using an input stream.
!     * @param artifact The domain object representing artifact to store
!     * @param is InputStream on artifact content
!     * @throws ConnectionException if physical repository cannot be connected
!     * @throws TransferException if something wrong occur after connection, during transfer
!     */
!    public void storeArtifact(Artifact artifact, InputStream is) throws ConnectionException, TransferException{
!       log.info("Storing stream of artifact with id: " + artifact.getUniqueId());
!       // Get structure path for artifact.
!       String structurePath = getStructurePath(artifact);
!       if (!structurePath.endsWith("/"))
!          structurePath += "/";
! 
!       // Build a path for target file.
!       String target = baseUrl + structurePath + artifact.getUniqueId();
!       log.debug("Content is an InputStream. Target file path is " + target);
! 
!       // Resolve destination file.
!       FileObject dest = null;
!       try{
!          FileSystemManager fsManager = VFS.getManager();
!          dest = fsManager.resolveFile(target);
!       }
!       catch (FileSystemException fse){
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while resolving the file into repository: " + target);
!          throw new ConnectionException("Exception while resolving target file into repository", fse);
!       }
! 
!       // Create an input and output streams for writing file.
!       OutputStream os = null;
!       try {os = dest.getContent().getOutputStream();}
!       catch (Exception e){
!          // Log and wrap exception into a connection exception.
!          log.error("Exception while opening copy streams into repository for: " + target);
!          throw new ConnectionException("Exception while opening copy streams into repository", e);
!       }
!       writeStream(is, os);
!    }
! 
! 
!    // Private ------------------------------------------------------------------
! 
!    /**
!     * Write an input stream content to a target output stream. This method closes
!     * the input and output streams at the end of write operation.
!     * @param is The input stream to use for getting data
!     * @param os The output stream to use for writing data
!     * @throws TransferException if an IOException occurs during writing output
!     */
!    private void writeStream(InputStream is, OutputStream os) throws TransferException{
!       try{
!          // Read is and write on fos unsing a buffer of bytes.
!          int bytes = 0;
!          byte[] buffer = new byte[8192];
!          while ((bytes = is.read(buffer, 0, 8192)) != -1)
!             os.write(buffer, 0, bytes);
!       }
!       catch (Exception e){
!          // Log and wrap IOException into a transfer exception.
!          log.error("IOException while writing into stream: " + os);
!          throw new TransferException("IOException while writing into target stream", e);
!       }
!       finally{
!          try {is.close();}
!          catch (Exception e) {/* Do nothing here... */}
!          try {os.close();}
!          catch (Exception e) {/* Do nothing here... */}
!       }
!    }
! 
!    /**
!     * Get a FileSelector implementation for filtering files
!     * corresponding to artifact.
!     * @return A FileSelector for artifact
!     */
!    private FileSelector getArtifactFileSelector(final Artifact artifact){
!       return new FileSelector(){
!          public boolean includeFile(FileSelectInfo info){
!             return info.getFile().getName().getBaseName().startsWith(artifact.getUniqueId());
!          }
!          public boolean traverseDescendents(FileSelectInfo info){
!             return false;
!          }
!       };
!    }
! }

[Join-cvs] join1/src/main/org/figure8/join/services/properties DeploymentPropertiesExtractor.java, 1.1, 1.2 PhysicalEnvironmentPropertiesExtractor.java, 1.2, 1.3

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/services/properties
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29706/services/properties

Modified Files:
	DeploymentPropertiesExtractor.java 
	PhysicalEnvironmentPropertiesExtractor.java 
Log Message:
Complete extracted properties set

Index: PhysicalEnvironmentPropertiesExtractor.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/services/properties/PhysicalEnvironmentPropertiesExtractor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PhysicalEnvironmentPropertiesExtractor.java	3 Oct 2006 19:21:37 -0000	1.2
--- PhysicalEnvironmentPropertiesExtractor.java	8 Apr 2007 19:00:41 -0000	1.3
***************
*** 74,79 ****
           String key = resource.getResourceType().getKey();
           props.setProperty(prefix + "resources." + key + ".name", resource.getName());
!          props.setProperty(prefix + "resources." + key + ".machine.name", resource.getMachine().getName());
!          props.setProperty(prefix + "resources." + key + ".machine.ip", resource.getMachine().getIpAddress());
        }
        // Return properties.
--- 74,81 ----
           String key = resource.getResourceType().getKey();
           props.setProperty(prefix + "resources." + key + ".name", resource.getName());
!          if (resource.getMachine() != null){
!             props.setProperty(prefix + "resources." + key + ".machine.name", resource.getMachine().getName());
!             props.setProperty(prefix + "resources." + key + ".machine.ip", resource.getMachine().getIpAddress());
!          }
        }
        // Return properties.
***************
*** 93,97 ****
        // Check that it is a deployment.
        if (!(obj instanceof PhysicalEnvironment))
!          throw new InvalidParameterException("This implementation of PropertiesExtract can only process PhysicalEnvironment");
        // Extract the properties of deployment.
        return extract((PhysicalEnvironment)obj);
--- 95,100 ----
        // Check that it is a deployment.
        if (!(obj instanceof PhysicalEnvironment))
!          throw new InvalidParameterException("This implementation of PropertiesExtractor "
!                  + " can only process PhysicalEnvironment");
        // Extract the properties of deployment.
        return extract((PhysicalEnvironment)obj);

Index: DeploymentPropertiesExtractor.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/services/properties/DeploymentPropertiesExtractor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DeploymentPropertiesExtractor.java	4 Jul 2006 20:03:02 -0000	1.1
--- DeploymentPropertiesExtractor.java	8 Apr 2007 19:00:41 -0000	1.2
***************
*** 67,72 ****
        props.setProperty(prefix + "applicant.comments", deployment.getApplicantComments());
        // Add environment related properties.
!       props.setProperty(prefix + "logicalenv.key", deployment.getEnvironmentMapping().getLogicalEnvironment().getKey());
!       props.setProperty(prefix + "logicalenv.label", deployment.getEnvironmentMapping().getLogicalEnvironment().getLabel());
        // Add target related properties.
        props.setProperty(prefix + "target.name", deployment.getTarget().getName());
--- 67,74 ----
        props.setProperty(prefix + "applicant.comments", deployment.getApplicantComments());
        // Add environment related properties.
!       props.setProperty(prefix + "logicalenv.key", deployment.getEnvironmentMapping()
!                                                                .getLogicalEnvironment().getKey());
!       props.setProperty(prefix + "logicalenv.label", deployment.getEnvironmentMapping()
!                                                                   .getLogicalEnvironment().getLabel());
        // Add target related properties.
        props.setProperty(prefix + "target.name", deployment.getTarget().getName());
***************
*** 75,78 ****
--- 77,84 ----
        AssemblyPropertiesExtractor extractor = new AssemblyPropertiesExtractor();
        props.putAll(extractor.extract(deployment.getAssembly(), prefix + "assembly."));
+       // Add properties corresponding to physical environment.
+       PhysicalEnvironmentPropertiesExtractor envExtractor = new PhysicalEnvironmentPropertiesExtractor();
+       props.putAll(envExtractor.extract(deployment.getEnvironmentMapping().getPhysicalEnvironment(),
+               prefix + "physicalenv."));
        return props;
     }

[Join-cvs] join1/src/main/org/figure8/join/services/notification/mail MailNotifierJMSAdapter.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/services/notification/mail
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27372/services/notification/mail

Modified Files:
	MailNotifierJMSAdapter.java 
Log Message:
Fixing Checkstyle errors

Index: MailNotifierJMSAdapter.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/services/notification/mail/MailNotifierJMSAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MailNotifierJMSAdapter.java	6 Feb 2007 21:29:05 -0000	1.1
--- MailNotifierJMSAdapter.java	8 Apr 2007 18:54:21 -0000	1.2
***************
*** 15,19 ****
  package org.figure8.join.services.notification.mail;
  
- import org.figure8.join.services.notification.Notifier;
  import org.figure8.join.services.notification.SubscribersNotifierJMSAdapter;
  import org.figure8.join.services.notification.SubscribersNotifier;
--- 15,18 ----

[Join-cvs] join1/src/main/org/figure8/join/services/notification/im XMPPNotifierJMSAdapter.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/services/notification/im
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25848/services/notification/im

Modified Files:
	XMPPNotifierJMSAdapter.java 
Log Message:
Fixing Checkstyle errors

Index: XMPPNotifierJMSAdapter.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/services/notification/im/XMPPNotifierJMSAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XMPPNotifierJMSAdapter.java	6 Feb 2007 21:29:46 -0000	1.1
--- XMPPNotifierJMSAdapter.java	8 Apr 2007 18:50:55 -0000	1.2
***************
*** 15,19 ****
  package org.figure8.join.services.notification.im;
  
- import org.figure8.join.services.notification.Notifier;
  import org.figure8.join.services.notification.SubscribersNotifierJMSAdapter;
  import org.figure8.join.services.notification.SubscribersNotifier;
--- 15,18 ----

[Join-cvs] join1/src/main/org/figure8/join/control AccessControlFilter.java, 1.1, 1.2 JoinAction.java, 1.4, 1.5

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/control
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24290/control

Modified Files:
	AccessControlFilter.java JoinAction.java 
Log Message:
Fix filter object for security constraints + add gobal exception handling

Index: JoinAction.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/JoinAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JoinAction.java	6 Feb 2007 21:37:48 -0000	1.4
--- JoinAction.java	8 Apr 2007 18:46:51 -0000	1.5
***************
*** 55,58 ****
--- 55,60 ----
     /** The request parameter which will contain the pathc of the page body. */
     public static final String  BODY_PARAMETER = "body";
+    /** The request attribute which will contain exception thrown by action processing. */
+    public static final String EXCEPTION_KEY = "exception";
  
     /** Rendering value for main page rendering */
***************
*** 184,189 ****
        String operation = request.getParameter(OP_PARAMETER);
        // Call doExecute from subclass.
!       ActionForward forward = doExecute(operation, mapping, form, request, response);
!      
        // Save next path into request attribute.
        String fwdPath = ((forward != null) ? forward.getPath() : "");
--- 186,197 ----
        String operation = request.getParameter(OP_PARAMETER);
        // Call doExecute from subclass.
!       ActionForward forward = null;
!       try {forward = doExecute(operation, mapping, form, request, response);}
!       catch (Throwable t){
!          // Store exception within request and forward to error page.
!          request.setAttribute(EXCEPTION_KEY, t);
!          forward = getActionForwardByPath("/jsp/servicefailure.jsp");
!       }
! 
        // Save next path into request attribute.
        String fwdPath = ((forward != null) ? forward.getPath() : "");

Index: AccessControlFilter.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/AccessControlFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AccessControlFilter.java	28 Feb 2007 23:51:17 -0000	1.1
--- AccessControlFilter.java	8 Apr 2007 18:46:51 -0000	1.2
***************
*** 122,125 ****
--- 122,126 ----
           }
        }
+       log.info("Filter initialized. AccessControlFilter is enable");
     }
     
***************
*** 176,182 ****
                    else if (!role.hasResourceParameter())
                       hasRole = container.isUserInRoleForResource(cachedRole, role.getResource());
!                   else
!                      hasRole = container.isUserInRoleForResource(cachedRole,
!                                                                   request.getParameter(role.getResourceParameter()));
                 }
              }
--- 177,195 ----
                    else if (!role.hasResourceParameter())
                       hasRole = container.isUserInRoleForResource(cachedRole, role.getResource());
!                   else{
!                      String resourceId = request.getParameter(role.getResourceParameter());
!                      try{
!                         // Retrieve resource for check if everything is ok.
!                         if (resourceId != null && cachedRole.getPermissionResourceResolver() != null){
!                            Object resource = cachedRole.getPermissionResourceResolver().getResource(resourceId);
!                            hasRole = container.isUserInRoleForResource(cachedRole, resource);
!                         }
!                      }
!                      catch (Throwable t){
!                         // Just warn into logs...
!                         log.warn("Throwable was caught when checking authorization for " + path);
!                         log.warn("Maybe join-access-control.xml is misconfigured or cached roles out of synch ?...");
!                      }
!                   }
                 }
              }

[Join-cvs] join1/src/main/org/figure8/join/control/form PhysicalEnvironmentForm.java, 1.2, 1.3

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/control/form
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23488/control/form

Modified Files:
	PhysicalEnvironmentForm.java 
Log Message:
Adding getting configuration at date feature + fixing Checkstyle errors

Index: PhysicalEnvironmentForm.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/form/PhysicalEnvironmentForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PhysicalEnvironmentForm.java	9 Oct 2006 20:23:50 -0000	1.2
--- PhysicalEnvironmentForm.java	8 Apr 2007 18:44:20 -0000	1.3
***************
*** 50,53 ****
--- 50,56 ----
     private int startMin;
  
+    /** Wether the requested operation is made from the logical environment point of view */
+    private boolean fromLogical = false;
+ 
     /** The String representation of changes tracking period start date. */
     private String startDateStr = null;
***************
*** 109,112 ****
--- 112,133 ----
     }
  
+    /** @return The configuration tracking start hour */
+    public int getStartHour(){
+       return startHour;
+    }
+    /** @return The configuration tracking start minute */
+    public int getStartMin(){
+       return startMin;
+    }
+ 
+    /** @return Wether the requested operation is made from the logical environment point of view */
+    public boolean isFromLogical(){
+       return fromLogical;
+    }
+    /** @param fromLogical Wether the requested operation is made from the logical environment point of view */
+    public void setFromLogical(boolean fromLogical){
+       this.fromLogical = fromLogical;
+    }
+ 
     /** @param startDateStr The String representation of changes tracking period start date (must be a date) */
     public void setStartDateStr(String startDateStr){
***************
*** 237,240 ****
--- 258,262 ----
        startDate = null;
        endDate = null;
+       fromLogical = false;
        startHour = 0;
        startMin = 0;

[Join-cvs] join1/src/main/org/figure8/join/control/config AccessControlRuleSet.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/control/config
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22735/control/config

Modified Files:
	AccessControlRuleSet.java 
Log Message:
Fix filter object for security constraints

Index: AccessControlRuleSet.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/config/AccessControlRuleSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AccessControlRuleSet.java	27 Feb 2007 21:06:41 -0000	1.1
--- AccessControlRuleSet.java	8 Apr 2007 18:42:40 -0000	1.2
***************
*** 18,23 ****
  import org.apache.commons.digester.RuleSetBase;
  /**
!  * The set of Digester rules required to parse a Join security control
!  * configuration file (<code>join-security-control.xml</code>).
   * @author  <a href="mailto:lau...@fr...">Laurent Broudoux</a>
   * @version $Revision$
--- 18,23 ----
  import org.apache.commons.digester.RuleSetBase;
  /**
!  * The set of Digester rules required to parse a Join access control
!  * configuration file (<code>join-access-control.xml</code>).
   * @author  <a href="mailto:lau...@fr...">Laurent Broudoux</a>
   * @version $Revision$
***************
*** 31,35 ****
      * specified <code>Digester</code> instance. This method should only
      * be called by a Digester instance. These rules assume that an instance of
!     * <code>org.figure8.join.security.AccessControlConfig</code> is pushed
      * onto the evaluation stack before parsing begins.
      * @param digester Digester instance to which the new Rule instances should be added.
--- 31,35 ----
      * specified <code>Digester</code> instance. This method should only
      * be called by a Digester instance. These rules assume that an instance of
!     * {@link org.figure8.join.control.config.AccessControlConfig} is pushed
      * onto the evaluation stack before parsing begins.
      * @param digester Digester instance to which the new Rule instances should be added.
***************
*** 39,47 ****
        // Create, set and add and ActionConstraintConfig.
        digester.addObjectCreate(
!          "join-security-control/action-constraints/action",
           "org.figure8.join.control.config.ActionConstraintConfig");
!       digester.addSetProperties("join-security-control/action-constraints/action");
        digester.addSetNext(
!          "join-security-control/action-constraints/action",
           "addActionConstraint",
           "org.figure8.join.control.config.ActionConstraintConfig");
--- 39,47 ----
        // Create, set and add and ActionConstraintConfig.
        digester.addObjectCreate(
!          "join-access-control/action-constraints/action",
           "org.figure8.join.control.config.ActionConstraintConfig");
!       digester.addSetProperties("join-access-control/action-constraints/action");
        digester.addSetNext(
!          "join-access-control/action-constraints/action",
           "addActionConstraint",
           "org.figure8.join.control.config.ActionConstraintConfig");
***************
*** 49,57 ****
        // Create, set and add RoleConfig to current ActionConstraintConfig.
        digester.addObjectCreate(
!          "join-security-control/action-constraints/action/role",
           "org.figure8.join.control.config.RoleConfig");
!       digester.addSetProperties("join-security-control/action-constraints/action/role");
        digester.addSetNext(
!          "join-security-control/action-constraints/action/role",
           "addRole",
           "org.figure8.join.control.config.RoleConfig");
--- 49,57 ----
        // Create, set and add RoleConfig to current ActionConstraintConfig.
        digester.addObjectCreate(
!          "join-access-control/action-constraints/action/role",
           "org.figure8.join.control.config.RoleConfig");
!       digester.addSetProperties("join-access-control/action-constraints/action/role");
        digester.addSetNext(
!          "join-access-control/action-constraints/action/role",
           "addRole",
           "org.figure8.join.control.config.RoleConfig");
***************
*** 59,67 ****
        // Create, set and add OperationConstraintConfig to current ActionConstraintConfig.
        digester.addObjectCreate(
!          "join-security-control/action-constraints/action/operation",
           "org.figure8.join.control.config.OperationConstraintConfig");
!       digester.addSetProperties("join-security-control/action-constraints/action/operation");
        digester.addSetNext(
!          "join-security-control/action-constraints/action/operation",
           "addOperationConstraint",
           "org.figure8.join.control.config.OperationConstraintConfig");
--- 59,67 ----
        // Create, set and add OperationConstraintConfig to current ActionConstraintConfig.
        digester.addObjectCreate(
!          "join-access-control/action-constraints/action/operation",
           "org.figure8.join.control.config.OperationConstraintConfig");
!       digester.addSetProperties("join-access-control/action-constraints/action/operation");
        digester.addSetNext(
!          "join-access-control/action-constraints/action/operation",
           "addOperationConstraint",
           "org.figure8.join.control.config.OperationConstraintConfig");
***************
*** 69,77 ****
        // Create, set and add RoleConfig to current OperationConstraintConfig.
        digester.addObjectCreate(
!          "join-security-control/action-constraints/action/operation/role",
           "org.figure8.join.control.config.RoleConfig");
!       digester.addSetProperties("join-security-control/action-constraints/action/operation/role");
        digester.addSetNext(
!          "join-security-control/action-constraints/action/operation/role",
           "addRole",
           "org.figure8.join.control.config.RoleConfig");
--- 69,77 ----
        // Create, set and add RoleConfig to current OperationConstraintConfig.
        digester.addObjectCreate(
!          "join-access-control/action-constraints/action/operation/role",
           "org.figure8.join.control.config.RoleConfig");
!       digester.addSetProperties("join-access-control/action-constraints/action/operation/role");
        digester.addSetNext(
!          "join-access-control/action-constraints/action/operation/role",
           "addRole",
           "org.figure8.join.control.config.RoleConfig");

[Join-cvs] join1/src/main/org/figure8/join/control/action DeliverableActions.java, 1.1, 1.2 PhysicalEnvironmentActions.java, 1.2, 1.3

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/control/action
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21949/control/action

Modified Files:
	DeliverableActions.java PhysicalEnvironmentActions.java 
Log Message:
Adding getting configuration at date feature + fixing Checkstyle errors

Index: PhysicalEnvironmentActions.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/action/PhysicalEnvironmentActions.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PhysicalEnvironmentActions.java	9 Oct 2006 20:21:22 -0000	1.2
--- PhysicalEnvironmentActions.java	8 Apr 2007 18:40:38 -0000	1.3
***************
*** 19,22 ****
--- 19,24 ----
  import org.figure8.join.core.DuplicateEntityException;
  import org.figure8.join.businessobjects.environment.PhysicalEnvironment;
+ import org.figure8.join.businessobjects.environment.LogicalEnvironment;
+ import org.figure8.join.businessobjects.environment.EnvironmentMapping;
  import org.figure8.join.businessfacades.environment.EnvironmentManager;
  import org.figure8.join.view.PhysicalEnvironmentTrackingView;
***************
*** 32,35 ****
--- 34,39 ----
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
+ 
+ import java.util.Calendar;
  /**
   * Struts action used for managing physical environments within Join application.
***************
*** 70,73 ****
--- 74,82 ----
     public static final String ENVIRONMENT_KEY = "environment";
     /**
+     * The request scope attribute under which the LogicalENvironment object
+     * selected is stored.
+     */
+    public static final String LOGICAL_ENVIRONMENT_KEY = "logicalEnvironment";
+    /**
      * The request scope attribute under which the retrieved PhysicalEnvironments
      * list is stored.
***************
*** 75,78 ****
--- 84,92 ----
     public static final String ENVIRONMENTS_KEY = "environments";
     /**
+     * The request scope attribute under which the date corresponding
+     * to environment configuration view is stored.
+     */
+    public static final String VIEW_DATE_KEY = "viewDate";
+    /**
      * The request scope attribute under which the configuration changes view
      * for a tracking period is stored.
***************
*** 119,123 ****
      * @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");
--- 133,138 ----
      * @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");
***************
*** 133,137 ****
        }
        else if (CONFIG_OP.equals(operation)){
!          return null;
        }
        else if (CHANGES_OP.equals(operation)){
--- 148,152 ----
        }
        else if (CONFIG_OP.equals(operation)){
!          return getEnvironmentConfigAtDate(mapping, form, request, response);
        }
        else if (CHANGES_OP.equals(operation)){
***************
*** 158,164 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward loadEnvironment(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!       throws Exception{
! 
        if (form instanceof PhysicalEnvironmentForm){
           // Get the requested environment from manager.
--- 173,178 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward loadEnvironment(ActionMapping mapping, ActionForm form,
!                                            HttpServletRequest request, HttpServletResponse response) throws Exception{
        if (form instanceof PhysicalEnvironmentForm){
           // Get the requested environment from manager.
***************
*** 185,191 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward saveEnvironment(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!          throws Exception{
! 
        if (form instanceof PhysicalEnvironmentForm){
           // Get the environment form.
--- 199,204 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward saveEnvironment(ActionMapping mapping, ActionForm form,
!                                            HttpServletRequest request, HttpServletResponse response) throws Exception{
        if (form instanceof PhysicalEnvironmentForm){
           // Get the environment form.
***************
*** 202,206 ****
           }
           else{
!             log.info("Update of existing PhysicalEnvironemnt having key: " + envForm.getKey());
              PropertyUtils.copyProperties(environment, envForm);
           }
--- 215,219 ----
           }
           else{
!             log.info("Update of existing PhysicalEnvironment having key: " + envForm.getKey());
              PropertyUtils.copyProperties(environment, envForm);
           }
***************
*** 230,244 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward getEnvironmentDetails(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!       throws Exception{
! 
        if (form instanceof PhysicalEnvironmentForm){
           // Get the requested environment from manager.
           PhysicalEnvironmentForm envForm = (PhysicalEnvironmentForm)form;
!          PhysicalEnvironment environment = environmentManager.getPhysicalEnvironment(envForm.getId());
  
           // Load the environments list and forward.
           request.setAttribute(ENVIRONMENT_KEY, environment);
-          request.setAttribute(ENVIRONMENTS_KEY, environmentManager.getPhysicalEnvironments());
           return mapping.findForward("EnvironmentViews");
        }
--- 243,268 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward getEnvironmentDetails(ActionMapping mapping, ActionForm form,
!                                                  HttpServletRequest request, HttpServletResponse response)
!            throws Exception{
        if (form instanceof PhysicalEnvironmentForm){
           // Get the requested environment from manager.
+          PhysicalEnvironment environment = null;
           PhysicalEnvironmentForm envForm = (PhysicalEnvironmentForm)form;
! 
!          if (!envForm.isFromLogical()){
!             log.debug("Getting environment details for PhysicalEnvironment '" + envForm.getId() + "'");
!             environment = environmentManager.getPhysicalEnvironment(envForm.getId());
!             request.setAttribute(ENVIRONMENTS_KEY, environmentManager.getPhysicalEnvironments());
!          }
!          else{
!             log.debug("Getting environment details for LogicalEnvironment '" + envForm.getId() + "'");
!             LogicalEnvironment logicalEnvironment = environmentManager.getLogicalEnvironment(envForm.getId());
!             environment = logicalEnvironment.getActiveEnvironmentMapping().getPhysicalEnvironment();
!             request.setAttribute(LOGICAL_ENVIRONMENT_KEY, logicalEnvironment);
!          }
  
           // Load the environments list and forward.
           request.setAttribute(ENVIRONMENT_KEY, environment);
           return mapping.findForward("EnvironmentViews");
        }
***************
*** 248,258 ****
  
     /**
      * Load a specified physical environment from datastore and get its configuration
      * changes during specified period (use startDate and endDate from form).
      * @return A forward to the next view to render and display
      */
!    protected ActionForward getEnvironmentChanges(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!       throws Exception{
! 
        if (form instanceof PhysicalEnvironmentForm){
           // Get the requested environment tracking view from manager.
--- 272,332 ----
  
     /**
+     * Load a specified physical environmnet from datastore ad get its configuration
+     * a precise datetime (use startDate, startHour and startMin from form).
+     * @return A forward to the new view to render and display
+     */
+    protected ActionForward getEnvironmentConfigAtDate(ActionMapping mapping, ActionForm form,
+                                                       HttpServletRequest request, HttpServletResponse response)
+            throws Exception{
+       if (form instanceof PhysicalEnvironmentForm){
+          // Get the requested environment view at date from manager.
+          PhysicalEnvironmentForm envForm = (PhysicalEnvironmentForm)form;
+ 
+          // Build correct datetime from form and request locale. 
+          Calendar date = Calendar.getInstance(request.getLocale());
+          date.setTime(envForm.getStartDate());
+          date.set(Calendar.HOUR_OF_DAY, envForm.getStartHour());
+          date.set(Calendar.MINUTE, envForm.getStartMin());
+ 
+          // Get configuration view.
+          PhysicalEnvironment view = null;
+          if (!envForm.isFromLogical()){
+             log.debug("Getting environment coniguration for PhysicalEnvironment '" + envForm.getKey() + "'");
+             view = environmentManager.getPhysicalEnvironmentAtDate(envForm.getKey(), date.getTime());
+             request.setAttribute(ENVIRONMENTS_KEY, environmentManager.getPhysicalEnvironments());
+          }
+          else{
+             log.debug("Getting environment configuration for LogicalEnvironment '" + envForm.getKey() + "'");
+             // Retrieve mapping active at wanted date.
+             LogicalEnvironment logicalEnvironment = environmentManager.getLogicalEnvironment(envForm.getKey());
+             EnvironmentMapping envMapping = environmentManager.getEnvironmentMappingAtDate(logicalEnvironment,
+                                                                                                 date.getTime());
+             // If no mapping, set an empty environemnt.
+             if (envMapping != null)
+                view = environmentManager.getPhysicalEnvironmentAtDate(envMapping.getPhysicalEnvironment().getKey(),
+                                                                         date.getTime());
+             else view = new PhysicalEnvironment();
+ 
+             request.setAttribute(LOGICAL_ENVIRONMENT_KEY, logicalEnvironment);
+          }
+ 
+          // Store configuration view, date and forward.
+          request.setAttribute(ENVIRONMENT_KEY, view);
+          request.setAttribute(VIEW_DATE_KEY, date.getTime());
+          return mapping.findForward("EnvironmentViews");
+       }
+       // This should not happen...
+       return null;
+    }
+ 
+ 
+    /**
      * Load a specified physical environment from datastore and get its configuration
      * changes during specified period (use startDate and endDate from form).
      * @return A forward to the next view to render and display
      */
!    protected ActionForward getEnvironmentChanges(ActionMapping mapping, ActionForm form,
!                                                  HttpServletRequest request, HttpServletResponse response)
!            throws Exception{
        if (form instanceof PhysicalEnvironmentForm){
           // Get the requested environment tracking view from manager.

Index: DeliverableActions.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/action/DeliverableActions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DeliverableActions.java	7 Jul 2006 22:20:46 -0000	1.1
--- DeliverableActions.java	8 Apr 2007 18:40:38 -0000	1.2
***************
*** 124,129 ****
      * @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");
--- 124,129 ----
      * @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");
***************
*** 161,167 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward loadDeliverable(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!          throws Exception{
! 
        if (form instanceof DeliverableForm){
           // Get the requested deliverable from manager
--- 161,166 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward loadDeliverable(ActionMapping mapping, ActionForm form,
!                                            HttpServletRequest request, HttpServletResponse response) throws Exception{
        if (form instanceof DeliverableForm){
           // Get the requested deliverable from manager
***************
*** 188,194 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward showDeliverableForm(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!          throws Exception{
! 
        if (form instanceof DeliverableForm){
           DeliverableForm dForm = (DeliverableForm)form;
--- 187,193 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward showDeliverableForm(ActionMapping mapping, ActionForm form,
!                                                HttpServletRequest request, HttpServletResponse response)
!            throws Exception{
        if (form instanceof DeliverableForm){
           DeliverableForm dForm = (DeliverableForm)form;
***************
*** 211,217 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward saveDeliverable(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!          throws Exception{
! 
        if (form instanceof DeliverableForm){
           DeliverableForm dForm = (DeliverableForm)form;
--- 210,215 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward saveDeliverable(ActionMapping mapping, ActionForm form,
!                                            HttpServletRequest request, HttpServletResponse response) throws Exception{
        if (form instanceof DeliverableForm){
           DeliverableForm dForm = (DeliverableForm)form;
***************
*** 241,247 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward createDeliverable(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!          throws Exception{
! 
        if (form instanceof DeliverableForm){
           DeliverableForm dForm = (DeliverableForm)form;
--- 239,244 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward createDeliverable(ActionMapping mapping, ActionForm form,
!                                              HttpServletRequest request, HttpServletResponse response) throws Exception{
        if (form instanceof DeliverableForm){
           DeliverableForm dForm = (DeliverableForm)form;
***************
*** 253,257 ****
  
           // Create deliverable and register it using manager.
!          Deliverable deliverable = new Deliverable(dForm.getVersionInfo(), dForm.getComments(), supplierId, release, type);
           log.info("Creation of a new Deliverable with key: " + deliverable.getKey());
  
--- 250,255 ----
  
           // Create deliverable and register it using manager.
!          Deliverable deliverable = new Deliverable(dForm.getVersionInfo(), dForm.getComments(),
!                                                       supplierId, release, type);
           log.info("Creation of a new Deliverable with key: " + deliverable.getKey());
  
***************
*** 274,280 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward searchDeliverables(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!          throws Exception{
! 
        if (form instanceof DeliverableForm){
           // Get the deliverable form.
--- 272,278 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward searchDeliverables(ActionMapping mapping, ActionForm form,
!                                               HttpServletRequest request, HttpServletResponse response)
!            throws Exception{
        if (form instanceof DeliverableForm){
           // Get the deliverable form.
***************
*** 301,307 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward getDeliverableDetails(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!          throws Exception{
! 
        if (form instanceof DeliverableForm){
           // Get the requested deliverable from manager
--- 299,305 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward getDeliverableDetails(ActionMapping mapping, ActionForm form,
!                                                  HttpServletRequest request, HttpServletResponse response)
!            throws Exception{
        if (form instanceof DeliverableForm){
           // Get the requested deliverable from manager
***************
*** 322,324 ****
        return null;
     }
! }
--- 320,322 ----
        return null;
     }
! }
\ No newline at end of file

[Join-cvs] join1/src/main/org/figure8/join/businessobjects/environment Parameter.java, 1.1, 1.2 ResourceMapping.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29326/businessobjects/environment

Modified Files:
	Parameter.java ResourceMapping.java 
Log Message:
Adding getting configuration at date feature + fixing Checkstyle errors

Index: ResourceMapping.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/ResourceMapping.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceMapping.java	22 Jul 2006 13:04:45 -0000	1.1
--- ResourceMapping.java	6 Apr 2007 21:15:15 -0000	1.2
***************
*** 31,35 ****
   * @hiberante.cache usage="read-write"
   *
!  * @hibernate.query name="join.resmapping_findByDateAndResource"
   *    query="from ResourceMapping mapping left join fetch mapping.physicalEnvironment"
   *             where mapping.startDate <= :endDate and (mapping.endDate >= :startDate or mapping.endDate is null)
--- 31,35 ----
   * @hiberante.cache usage="read-write"
   *
!  * @hibernate.query name="join.resmapping_findByIntervalAndResource"
   *    query="from ResourceMapping mapping left join fetch mapping.physicalEnvironment"
   *             where mapping.startDate <= :endDate and (mapping.endDate >= :startDate or mapping.endDate is null)
***************
*** 37,40 ****
--- 37,44 ----
   * @hibernate.query name="join.resmapping_findByDateAndEnvironment"
   *    query="from ResourceMapping mapping left join fetch mapping.resource
+  *             where mapping.startDate <= :date and (mapping.endDate >= :date or mapping.endDate is null)
+  *                and mapping.physicalEnvironment = :physicalEnv order by mapping.startDate asc"
+  * @hibernate.query name="join.resmapping_findByIntervalAndEnvironment"
+  *    query="from ResourceMapping mapping left join fetch mapping.resource
   *             where mapping.startDate <= :endDate and (mapping.endDate >= :startDate or mapping.endDate is null)
   *                and mapping.physicalEnvironment = :physicalEnv order by mapping.startDate asc"

Index: Parameter.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/Parameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Parameter.java	22 Jul 2006 13:04:45 -0000	1.1
--- Parameter.java	6 Apr 2007 21:15:15 -0000	1.2
***************
*** 50,55 ****
      */
     public Parameter(String name, String description){
!    	this.name = name;
!    	this.description = description;
     }
  
--- 50,55 ----
      */
     public Parameter(String name, String description){
!       this.name = name;
!       this.description = description;
     }
  
***************
*** 65,69 ****
      */
     public String getName(){
!    	return name;
     }
     /**
--- 65,69 ----
      */
     public String getName(){
!       return name;
     }
     /**
***************
*** 72,76 ****
      */
     public void setName(String name){
!    	this.name = name;
     }
     
--- 72,76 ----
      */
     public void setName(String name){
!       this.name = name;
     }
     
***************
*** 81,85 ****
      */
     public String getDescription(){
!    	return description;
     }
     /**
--- 81,85 ----
      */
     public String getDescription(){
!       return description;
     }
     /**
***************
*** 88,92 ****
      */
     public void setDescription(String description){
!    	this.description = description;
     }
  }
--- 88,92 ----
      */
     public void setDescription(String description){
!       this.description = description;
     }
  }

[Join-cvs] join1/src/main/org/figure8/join/businessobjects/environment Deployment.java, 1.2, 1.3 EnvironmentMapping.java, 1.2, 1.3

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28869/businessobjects/environment

Modified Files:
	Deployment.java EnvironmentMapping.java 
Log Message:
Fixing Checkstyle errors

Index: EnvironmentMapping.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/EnvironmentMapping.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EnvironmentMapping.java	7 Jan 2007 22:27:35 -0000	1.2
--- EnvironmentMapping.java	6 Apr 2007 21:12:38 -0000	1.3
***************
*** 40,43 ****
--- 40,47 ----
   *    query="from EnvironmentMapping mapping left join fetch mapping.physicalEnvironment
   *                where mapping.logicalEnvironment = :logicalEnv order by mapping.startDate desc"
+  * @hibernate.query name="join.envmapping_findByDateAndLogicalEnvironment"
+  *    query="from EnvironmentMapping mapping left join fetch mapping.physicalEnvironment
+  *                where mapping.startDate <= :date and (mapping.endDate >= :date or mapping.endDate is null)
+  *                   and mapping.logicalEnvironment = :logicalEnv order by mapping.startDate desc"
   * @hibernate.query name="join.envmapping_findByPhysicalEnvironment"
   *    query="from EnvironmentMapping mapping left join fetch mapping.logicalEnvironment

Index: Deployment.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/Deployment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Deployment.java	14 Jan 2007 14:17:58 -0000	1.2
--- Deployment.java	6 Apr 2007 21:12:38 -0000	1.3
***************
*** 223,231 ****
      */
     public Status getStatus(){
!    	return status;
     }
     /** @param status The current status of this deployment */
     public void setStatus(Status status){
!    	this.status = status;
     }
     
--- 223,231 ----
      */
     public Status getStatus(){
!       return status;
     }
     /** @param status The current status of this deployment */
     public void setStatus(Status status){
!       this.status = status;
     }
     

[Join-cvs] join1/src/main/org/figure8/join/businessobjects/artifact/persistence HibernateDeliverableTypeDao.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/artifact/persistence
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28016/businessobjects/artifact/persistence

Modified Files:
	HibernateDeliverableTypeDao.java 
Log Message:
Fixing Checkstyle errors

Index: HibernateDeliverableTypeDao.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/artifact/persistence/HibernateDeliverableTypeDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HibernateDeliverableTypeDao.java	19 Jul 2006 22:47:03 -0000	1.1
--- HibernateDeliverableTypeDao.java	6 Apr 2007 21:10:33 -0000	1.2
***************
*** 76,80 ****
        // Try retrieving it from database.
        if (type == null){
!          type = (DeliverableType)findSingleObject(findNamedQueryStringParam("join.deltype_findByKey", "typeKey", key, true));
        }
        if (log.isDebugEnabled())
--- 76,81 ----
        // Try retrieving it from database.
        if (type == null){
!          type = (DeliverableType)findSingleObject(findNamedQueryStringParam("join.deltype_findByKey",
!                                                                               "typeKey", key, true));
        }
        if (log.isDebugEnabled())
***************
*** 110,114 ****
     // Private ------------------------------------------------------------------
  
!    /** Get the eternal cache for deliverable types or null if it is not available */
     public Cache getDeliverableTypeKeyToDeliverableTypeCache(){
        if (cacheManager != null){
--- 111,118 ----
     // Private ------------------------------------------------------------------
  
!    /**
!     * Get the eternal cache for deliverable types or null if it is not available
!     * @return The eternal cache for deliverbale types or null
!     */
     public Cache getDeliverableTypeKeyToDeliverableTypeCache(){
        if (cacheManager != null){

[Join-cvs] join1/src/main/org/figure8/join/businessobjects/environment/persistence EnvironmentMappingDao.java, 1.1, 1.2 HibernateEnvironmentMappingDao.java, 1.1, 1.2 HibernateLogicalEnvironmentDao.java, 1.1, 1.2 HibernateParameterValueDao.java, 1.2, 1.3 HibernatePhysicalEnvironmentDao.java, 1.1, 1.2 HibernateResourceMappingDao.java, 1.2, 1.3 LogicalEnvironmentDao.java, 1.1, 1.2 ResourceMappingDao.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/persistence
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26444/businessobjects/environment/persistence

Modified Files:
	EnvironmentMappingDao.java HibernateEnvironmentMappingDao.java 
	HibernateLogicalEnvironmentDao.java 
	HibernateParameterValueDao.java 
	HibernatePhysicalEnvironmentDao.java 
	HibernateResourceMappingDao.java LogicalEnvironmentDao.java 
	ResourceMappingDao.java 
Log Message:
Adding getting configuration at date feature + fixing Checkstyle errors

Index: ResourceMappingDao.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/persistence/ResourceMappingDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceMappingDao.java	22 Jul 2006 13:07:19 -0000	1.1
--- ResourceMappingDao.java	6 Apr 2007 21:05:59 -0000	1.2
***************
*** 48,51 ****
--- 48,59 ----
  
     /**
+     * Retrieve the list of resource mappings active for environment on specfied date
+     * @param environment The physical environment to retrieve mappings for
+     * @param date The date to retrieve active mappings
+     * @return A list of {@code org.figure8.join.businessobjects.environment.ResourceMapping} objects
+     */
+    public abstract List getResourceMappingsForEnvironment(PhysicalEnvironment environment, Date date);
+ 
+    /**
      * Retrieve a list of resource mappings done onto an environment during a specified interval.
      * @param environment The physical environment to retrieve mappings for
***************
*** 54,57 ****
      * @return A list of {@code org.figure8.join.businessobjects.environment.ResourceMapping} objects
      */
!    public abstract List getResourceMappingsForEnvironment(PhysicalEnvironment environment, Date startDate, Date endDate);
  }
--- 62,66 ----
      * @return A list of {@code org.figure8.join.businessobjects.environment.ResourceMapping} objects
      */
!    public abstract List getResourceMappingsForEnvironment(PhysicalEnvironment environment,
!                                                             Date startDate, Date endDate);
  }

Index: LogicalEnvironmentDao.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/persistence/LogicalEnvironmentDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LogicalEnvironmentDao.java	22 Jul 2006 13:07:19 -0000	1.1
--- LogicalEnvironmentDao.java	6 Apr 2007 21:05:59 -0000	1.2
***************
*** 27,30 ****
--- 27,37 ----
  
     /**
+     * Retrieve a logical environment using its entity identifier
+     * @param id The environment unique identifier
+     * @return The LogicalEnvironment with this id or null if no environment is found
+     */
+    public abstract LogicalEnvironment getLogicalEnvironment(long id);
+ 
+    /**
      * Retrieve a logical environment using its key
      * @param key The business key of the environment to retrieve

Index: HibernateResourceMappingDao.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/persistence/HibernateResourceMappingDao.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HibernateResourceMappingDao.java	3 Oct 2006 22:50:51 -0000	1.2
--- HibernateResourceMappingDao.java	6 Apr 2007 21:05:59 -0000	1.3
***************
*** 64,68 ****
      */
     public List getResourceMappingsForResource(AbstractResource resource, Date startDate, Date endDate){
!       List result = findNamedQueryStringParams("join.resmapping_findByDateAndResource", "resource", resource,
                "startDate", startDate, "endDate", endDate);
        if (log.isDebugEnabled())
--- 64,68 ----
      */
     public List getResourceMappingsForResource(AbstractResource resource, Date startDate, Date endDate){
!       List result = findNamedQueryStringParams("join.resmapping_findByIntervalAndResource", "resource", resource,
                "startDate", startDate, "endDate", endDate);
        if (log.isDebugEnabled())
***************
*** 72,75 ****
--- 72,89 ----
  
     /**
+     * Retrieve the list of resource mappings active for environment on specfied date
+     * @param environment The physical environment to retrieve mappings for
+     * @param date The date to retrieve active mappings
+     * @return A list of {@code org.figure8.join.businessobjects.environment.ResourceMapping} objects
+     */
+    public List getResourceMappingsForEnvironment(PhysicalEnvironment environment, Date date){
+       List result = findNamedQueryStringParams("join.resmapping_findByDateAndEnvironment", "physicalEnv", environment,
+               "date", date);
+       if (log.isDebugEnabled())
+          log.debug("Found " + result.size() + " ResourceMappings for environment " + environment.getName());
+       return result;
+    }
+ 
+    /**
      * Retrieve a list of resource mappings done onto an environment during a specified interval.
      * @param environment The physical environment to retrieve mappings for
***************
*** 79,84 ****
      */
     public List getResourceMappingsForEnvironment(PhysicalEnvironment environment, Date startDate, Date endDate){
!       List result = findNamedQueryStringParams("join.resmapping_findByDateAndEnvironment", "physicalEnv", environment,
!               "startDate", startDate, "endDate", endDate);
        if (log.isDebugEnabled())
           log.debug("Found " + result.size() + " ResourceMappings for environment " + environment.getName());
--- 93,98 ----
      */
     public List getResourceMappingsForEnvironment(PhysicalEnvironment environment, Date startDate, Date endDate){
!       List result = findNamedQueryStringParams("join.resmapping_findByIntervalAndEnvironment",
!               "physicalEnv", environment, "startDate", startDate, "endDate", endDate);
        if (log.isDebugEnabled())
           log.debug("Found " + result.size() + " ResourceMappings for environment " + environment.getName());

Index: HibernateParameterValueDao.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/persistence/HibernateParameterValueDao.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HibernateParameterValueDao.java	3 Oct 2006 22:49:28 -0000	1.2
--- HibernateParameterValueDao.java	6 Apr 2007 21:05:59 -0000	1.3
***************
*** 16,20 ****
  
  import org.figure8.join.core.persistence.HibernateObjectDao;
- import org.figure8.join.core.EntityObject;
  import org.figure8.join.businessobjects.environment.Parameter;
  import org.figure8.join.businessobjects.environment.ParameterValue;
--- 16,19 ----

Index: HibernateEnvironmentMappingDao.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/persistence/HibernateEnvironmentMappingDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HibernateEnvironmentMappingDao.java	22 Jul 2006 13:07:19 -0000	1.1
--- HibernateEnvironmentMappingDao.java	6 Apr 2007 21:05:58 -0000	1.2
***************
*** 24,27 ****
--- 24,28 ----
  
  import java.util.List;
+ import java.util.Date;
  /**
   * Implementation of EnvironmentMappingDao using Hibernate ORM system.
***************
*** 72,75 ****
--- 73,92 ----
  
     /**
+     * Retrieve the environment mapping for a LogicalEnvironment active at specified date
+     * @param logicalEnv The logical environment to retrieve mapping for
+     * @param date The date to retrieve active mapping
+     * @return The active {@code org.figure8.join.businessobjects.environment.EnvironmentMapping} or null
+     */
+    public EnvironmentMapping getEnvironmentMapping(LogicalEnvironment logicalEnv, Date date){
+       // Result should be a single object.
+       EnvironmentMapping result = (EnvironmentMapping)findSingleObject(findNamedQueryStringParams(
+                                                          "join.envmapping_findByDateAndLogicalEnvironment",
+                                                             "logicalEnv", logicalEnv, "date", date));
+       if (result == null)
+          log.debug("No EnvironmentMapping was active for logical env '" + logicalEnv.getKey() + "' at " + date);
+       return result;
+    }
+ 
+    /**
      * Retrieve all the environment mappings for a PhysicalEnvironment through time
      * @param physicalEnv The physical environment to retrieve mappings for

Index: HibernateLogicalEnvironmentDao.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/persistence/HibernateLogicalEnvironmentDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HibernateLogicalEnvironmentDao.java	22 Jul 2006 13:07:19 -0000	1.1
--- HibernateLogicalEnvironmentDao.java	6 Apr 2007 21:05:59 -0000	1.2
***************
*** 37,40 ****
--- 37,53 ----
  
     /**
+     * Retrieve a logical environment using its entity identifier
+     * @param id The environment unique identifier
+     * @return The LogicalEnvironment with this id or null if no environment is found
+     */
+    public LogicalEnvironment getLogicalEnvironment(long id){
+       // Result should be a single object.
+       LogicalEnvironment result = (LogicalEnvironment)getById(id);
+       if (result == null)
+          log.debug("LogicalEnvironment with id '" + id + "' is not defined !");
+       return result;
+    }
+ 
+    /**
      * Retrieve a logical environment using its key
      * @param key The business key of the environment to retrieve
***************
*** 43,47 ****
     public LogicalEnvironment getLogicalEnvironment(String key){
        // Result should be a single object.
!       LogicalEnvironment result = (LogicalEnvironment)findSingleObject(findNamedQueryStringParam("join.logicalenv_findByKey", "envKey", key, true));
        if (result == null)
           log.debug("LogicalEnvironment with key '" + key + "' is not defined !");
--- 56,61 ----
     public LogicalEnvironment getLogicalEnvironment(String key){
        // Result should be a single object.
!       LogicalEnvironment result = (LogicalEnvironment)findSingleObject(
!                                        findNamedQueryStringParam("join.logicalenv_findByKey", "envKey", key, true));
        if (result == null)
           log.debug("LogicalEnvironment with key '" + key + "' is not defined !");

Index: EnvironmentMappingDao.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/persistence/EnvironmentMappingDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EnvironmentMappingDao.java	22 Jul 2006 13:07:19 -0000	1.1
--- EnvironmentMappingDao.java	6 Apr 2007 21:05:58 -0000	1.2
***************
*** 21,24 ****
--- 21,25 ----
  
  import java.util.List;
+ import java.util.Date;
  /**
   * Data Access interface for EnvironmentMapping business objects.
***************
*** 45,48 ****
--- 46,57 ----
  
     /**
+     * Retrieve the environment mapping for a LogicalEnvironment active at specified date
+     * @param logicalEnv The logical environment to retrieve mapping for
+     * @param date The date to retrieve active mapping
+     * @return The active {@code org.figure8.join.businessobjects.environment.EnvironmentMapping} or null
+     */
+    public abstract EnvironmentMapping getEnvironmentMapping(LogicalEnvironment logicalEnv, Date date);
+ 
+    /**
      * Retrieve all the environment mappings for a PhysicalEnvironment through time
      * @param physicalEnv The physical environment to retrieve mappings for

Index: HibernatePhysicalEnvironmentDao.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/persistence/HibernatePhysicalEnvironmentDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HibernatePhysicalEnvironmentDao.java	22 Jul 2006 13:07:19 -0000	1.1
--- HibernatePhysicalEnvironmentDao.java	6 Apr 2007 21:05:59 -0000	1.2
***************
*** 55,59 ****
     public PhysicalEnvironment getPhysicalEnvironment(String key){
        // Result should be a single object.
!       PhysicalEnvironment result = (PhysicalEnvironment)findSingleObject(findNamedQueryStringParam("join.physicalenv_findByKey", "envKey", key));
        if (result == null)
           log.debug("PhysicalEnvironment with key '" + key + "' is not defined !");
--- 55,60 ----
     public PhysicalEnvironment getPhysicalEnvironment(String key){
        // Result should be a single object.
!       PhysicalEnvironment result = (PhysicalEnvironment)findSingleObject(
!                                        findNamedQueryStringParam("join.physicalenv_findByKey", "envKey", key));
        if (result == null)
           log.debug("PhysicalEnvironment with key '" + key + "' is not defined !");