June 2012 - Chorem-commits - mailman.cloud.codelutin.com

r198 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org June 29, 2012

June 29, 2012

Author: bpoussin Date: 2012-06-29 10:58:33 +0200 (Fri, 29 Jun 2012) New Revision: 198 Url: http://chorem.org/repositories/revision/chorem/198 Log: correction type en category Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-06-29 08:58:07 UTC (rev 197) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-06-29 08:58:33 UTC (rev 198) @@ -45,7 +45,7 @@ <tbody> <tr> <td><a href="<c:url value="/wikitty/Project/view/${q.project}"/>">${q.getProject(false).getName()}</a></td> - <td>${q.category}</td> + <td><a href="<c:url value="/wikitty/Category/view/${q.category}"/>">${q.getCategory(false)}</a></td> <td><a href="<c:url value="/wikitty/Quotation/view/${q.wikittyId}"/>">${q.description}</a></td> <td><a href="<c:url value="/wikitty/Employee/view/${q.customer}"/>">${q.getCustomer(false)}</a></td> <td><a href="<c:url value="/wikitty/Employee/view/${q.supplier}"/>">${q.getSupplier(false)}</a></td>

1 0

r197 - trunk/chorem-entities/src/main/java/org/chorem
by bpoussin＠users.chorem.org June 29, 2012

June 29, 2012

Author: bpoussin Date: 2012-06-29 10:58:07 +0200 (Fri, 29 Jun 2012) New Revision: 197 Url: http://chorem.org/repositories/revision/chorem/197 Log: ajout doc d'export depuis postgresql Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-06-28 22:08:16 UTC (rev 196) +++ trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-06-29 08:58:07 UTC (rev 197) @@ -43,10 +43,12 @@ /** * Les donnees doivent etre exportees de la base postgresql avec les commandes: * <pre> - * \copy employee to '/tmp/chorem-employee.csv' delimiters ';' CSV HEADER - * \copy company to '/tmp/chorem-company.csv' delimiters ';' CSV HEADER - * \copy person to '/tmp/chorem-person.csv' delimiters ';' CSV HEADER - * ... + * \copy employee to '/tmp/chorem-employee.csv' delimiter ';' CSV HEADER + * \copy company to '/tmp/chorem-company.csv' delimiter ';' CSV HEADER + * \copy person to '/tmp/chorem-person.csv' delimiter ';' CSV HEADER + * \copy contracttype to '/tmp/chorem-contracttype.csv' delimiter ';' CSV HEADER + * \copy contract to '/tmp/chorem-contract.csv' delimiter ';' CSV HEADER + * * </pre> * * @author poussin

1 0

r196 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org June 28, 2012

June 28, 2012

Author: bpoussin Date: 2012-06-29 00:08:16 +0200 (Fri, 29 Jun 2012) New Revision: 196 Url: http://chorem.org/repositories/revision/chorem/196 Log: modif type to category Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-06-26 16:08:21 UTC (rev 195) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-06-28 22:08:16 UTC (rev 196) @@ -29,7 +29,7 @@ <thead> <tr> <th>Project</th> - <th>Type</th> + <th>Category</th> <th>Description</th> <th>Customer</th> <th>Supplier</th> @@ -46,7 +46,7 @@ <tbody> <tr> <td><a href="<c:url value="/wikitty/Project/view/${q.project}"/>">${q.getProject(false).getName()}</a></td> - <td>${q.type}</td> + <td><a href="<c:url value="/wikitty/Category/view/${q.category}"/>">${q.getCategory(false)}</a></td> <td><a href="<c:url value="/wikitty/Quotation/view/${q.wikittyId}"/>">${q.description}</a></td> <td><a href="<c:url value="/wikitty/Employee/view/${q.customer}"/>">${q.getCustomer(false)}</a></td> <td><a href="<c:url value="/wikitty/Employee/view/${q.supplier}"/>">${q.getSupplier(false)}</a></td>

1 0

r195 - trunk/chorem-webmotion/src/jetty
by ymartel＠users.chorem.org June 26, 2012

June 26, 2012

Author: ymartel Date: 2012-06-26 18:08:21 +0200 (Tue, 26 Jun 2012) New Revision: 195 Url: http://chorem.org/repositories/revision/chorem/195 Log: update file header Modified: trunk/chorem-webmotion/src/jetty/jetty-context.xml Modified: trunk/chorem-webmotion/src/jetty/jetty-context.xml =================================================================== --- trunk/chorem-webmotion/src/jetty/jetty-context.xml 2012-06-26 13:12:09 UTC (rev 194) +++ trunk/chorem-webmotion/src/jetty/jetty-context.xml 2012-06-26 16:08:21 UTC (rev 195) @@ -1,5 +1,28 @@ <?xml version="1.0" encoding="ISO-8859-1"?> + + <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">

1 0

r194 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by ymartel＠users.chorem.org June 26, 2012

June 26, 2012

Author: ymartel Date: 2012-06-26 15:12:09 +0200 (Tue, 26 Jun 2012) New Revision: 194 Url: http://chorem.org/repositories/revision/chorem/194 Log: fix urls in menu Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-06-25 18:58:11 UTC (rev 193) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-06-26 13:12:09 UTC (rev 194) @@ -141,7 +141,7 @@ </ul> </li> <li class="dropdown nav-group"> - <a href="/hr">HR</a> + <a href="<c:url value="/hr"/>">HR</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> @@ -157,7 +157,7 @@ </ul> </li> <li class="dropdown nav-group"> - <a href="/admin">Admin</a> + <a href="<c:url value="/admin"/>">Admin</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown">

1 0

r193 - in trunk/chorem-webmotion: . src/main/webapp/WEB-INF/jsp
by ymartel＠users.chorem.org June 25, 2012

June 25, 2012

Author: ymartel Date: 2012-06-25 20:58:11 +0200 (Mon, 25 Jun 2012) New Revision: 193 Url: http://chorem.org/repositories/revision/chorem/193 Log: fix path to static ressources with jstl Modified: trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2012-06-25 10:48:00 UTC (rev 192) +++ trunk/chorem-webmotion/pom.xml 2012-06-25 18:58:11 UTC (rev 193) @@ -219,7 +219,7 @@ <configuration> <stopKey>A</stopKey> <stopPort>1269</stopPort> - <contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml> +  <webAppConfig> <contextPath>/chorem</contextPath> </webAppConfig> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-06-25 10:48:00 UTC (rev 192) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-06-25 18:58:11 UTC (rev 193) @@ -34,21 +34,22 @@ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script> <script type="text/javascript" src="http://jquery-ui.googlecode.com/svn/trunk/ui/i18n/jquery.ui.datepicker-fr.js"></script> - <script type="text/javascript" src="/js/jquery-ui-timepicker-addon.js"></script> - <script type="text/javascript" src="/js/jquery-ui-timepicker-fr.js"></script> + <script type="text/javascript" src="<c:url value="/js/jquery-ui-timepicker-addon.js "/>"></script> + <script type="text/javascript" src="<c:url value="/js/jquery-ui-timepicker-fr.js "/>"></script> <%-- Bootstrap --%> - <link rel="stylesheet" href="/css/bootstrap.min.css"> - <link rel="stylesheet" href="/css/bootstrap-responsive.min.css"> - <script src="/js/bootstrap.min.js"></script> + <link rel="stylesheet" href="<c:url value="/css/bootstrap.min.css"/>"> + <link rel="stylesheet" href="<c:url value="/css/bootstrap-responsive.min.css"/>"> + <script src="<c:url value="/js/bootstrap.min.js"/>"></script> <%-- multi selection ajax --%> - <script type="text/javascript" src="/js/jquery.tokeninput.js"></script> - <link rel="stylesheet" type="text/css" href="/css/token-input.css" /> - <link rel="stylesheet" type="text/css" href="/css/token-input-mac.css" /> - <link rel="stylesheet" type="text/css" href="/css/token-input-facebook.css" /> + <script type="text/javascript" src="<c:url value="/js/jquery.tokeninput.js"/>"></script> + <link rel="stylesheet" type="text/css" href="<c:url value="/css/token-input.css"/>" /> + <link rel="stylesheet" type="text/css" href="<c:url value="/css/token-input-mac.css"/>" /> + <link rel="stylesheet" type="text/css" href="<c:url value="/css/token-input-facebook.css"/>" /> + <link rel="stylesheet" type="text/css" href="<c:url value="/css/token-input-facebook.css"/>" /> <%-- Specific chorem --%> - <link rel="stylesheet/less" href="/css/chorem.less"> - <script src="/js/less-1.2.1.min.js"></script> - <script src="/js/chorem.js"></script> + <link rel="stylesheet/less" href="<c:url value="/css/chorem.less "/>"> + <script src="<c:url value="/js/less-1.2.1.min.js "/>"></script> + <script src="<c:url value="/js/chorem.js "/>"></script> </head> <body> <div class="navbar navbar-fixed-top"> @@ -61,7 +62,7 @@ <span class="icon-bar"></span> </a> - <a class="brand" href="/">Chorem</a> + <a class="brand" href="<c:url value="/"/>">Chorem</a>  <div class="nav-collapse"> @@ -136,7 +137,7 @@ <li><a href="<c:url value="/wikitty/Category/edit/new"/>"><i class="icon-plus icon-black"></i> Add category</a></li> <li class="divider"></li> <li>Other</li> - <li><a href="/wikitty/search?query=extension=Accounting">Accounting</a></li> + <li><a href="<c:url value="wikitty/search?query=extension=Accounting"/>">Accounting</a></li> </ul> </li> <li class="dropdown nav-group"> @@ -151,8 +152,8 @@ <li><a href="<c:url value="/wikitty/Vacation/search"/>"><i class="icon-th-list icon-black"></i> All vacations</a></li> <li><a href="<c:url value="/wikitty/Vacation/edit/new"/>"><i class="icon-plus icon-black"></i> Add vacation</a></li> <li class="divider"></li> - <li><a href="/wikitty/search?query=extension=Employee">Employee</a></li> - <li><a href="/wikitty/search?query=extension=Interview">Annual interview</a></li> + <li><a href="<c:url value="/wikitty/search?query=extension=Employee"/>">Employee</a></li> + <li><a href="<c:url value="/wikitty/search?query=extension=Interview"/>">Annual interview</a></li> </ul> </li> <li class="dropdown nav-group"> @@ -167,7 +168,7 @@ <li><a href="<c:url value="/wikitty/WikittyUser/search"/>"><i class="icon-th-list icon-black"></i> All users</a></li> <li><a href="<c:url value="/wikitty/WikittyUser/edit/new"/>"><i class="icon-plus icon-black"></i> Add user</a></li> <li class="divider"></li> - <li><a href="/admin/variables">Variables</a></li> + <li><a href="<c:url value="/admin/variables"/>">Variables</a></li> </ul> </li> </ul>

1 0

r192 - in trunk/chorem-webmotion: . src src/jetty
by ymartel＠users.chorem.org June 25, 2012

June 25, 2012

Author: ymartel Date: 2012-06-25 12:48:00 +0200 (Mon, 25 Jun 2012) New Revision: 192 Url: http://chorem.org/repositories/revision/chorem/192 Log: add plugins management for tomcat and jetty plugins Added: trunk/chorem-webmotion/src/jetty/ trunk/chorem-webmotion/src/jetty/jetty-context.xml Modified: trunk/chorem-webmotion/pom.xml Modified: trunk/chorem-webmotion/pom.xml =================================================================== (Binary files differ) Property changes on: trunk/chorem-webmotion/pom.xml ___________________________________________________________________ Modified: svn:mime-type - application/xml + text/xml Added: trunk/chorem-webmotion/src/jetty/jetty-context.xml =================================================================== --- trunk/chorem-webmotion/src/jetty/jetty-context.xml (rev 0) +++ trunk/chorem-webmotion/src/jetty/jetty-context.xml 2012-06-25 10:48:00 UTC (rev 192) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> + +<Configure class="org.eclipse.jetty.webapp.WebAppContext"> + <Call name="setAttribute"> + <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> + <Arg>.*/.*webmotion-[^/]\.jar$|.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> + </Call> +</Configure> \ No newline at end of file

1 0

r191 - in trunk: . chorem-entities chorem-webmotion
by maven-release＠users.chorem.org June 25, 2012

June 25, 2012

Author: maven-release Date: 2012-06-25 10:53:54 +0200 (Mon, 25 Jun 2012) New Revision: 191 Url: http://chorem.org/repositories/revision/chorem/191 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/chorem-entities/pom.xml trunk/chorem-webmotion/pom.xml trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2012-06-25 08:53:53 UTC (rev 190) +++ trunk/chorem-entities/pom.xml 2012-06-25 08:53:54 UTC (rev 191) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/chorem-webmotion/pom.xml =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-25 08:53:53 UTC (rev 190) +++ trunk/pom.xml 2012-06-25 08:53:54 UTC (rev 191) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> <modules> <module>chorem-entities</module> @@ -74,11 +74,11 @@ </developers> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/chorem/tags/chorem-0.1</connection> + <connection>scm:svn:http://svn.chorem.org/svn/chorem/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/chorem/tags/chorem-0.1 + scm:svn:http://svn.chorem.org/svn/chorem/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/chorem/tags/chorem-0.1</url> + <url>http://www.chorem.org/repositories/browse/chorem/trunk</url> </scm> <distributionManagement>

1 0

r190 - tags
by maven-release＠users.chorem.org June 25, 2012

June 25, 2012

Author: maven-release Date: 2012-06-25 10:53:53 +0200 (Mon, 25 Jun 2012) New Revision: 190 Url: http://chorem.org/repositories/revision/chorem/190 Log: [maven-release-plugin] copy for tag chorem-0.1 Added: tags/chorem-0.1/

1 0

r189 - /
by maven-release＠users.chorem.org June 25, 2012

June 25, 2012

Author: maven-release Date: 2012-06-25 10:51:54 +0200 (Mon, 25 Jun 2012) New Revision: 189 Url: http://chorem.org/repositories/revision/chorem/189 Log: Et bien Bravo\! Added: tags/

1 0