February 2012 - Nuiton-web-commits - mailman.cloud.codelutin.com

r193 - trunk
by athimel＠users.nuiton.org Feb. 29, 2012

Feb. 29, 2012

Author: athimel Date: 2012-02-29 12:32:21 +0100 (Wed, 29 Feb 2012) New Revision: 193 Url: http://nuiton.org/repositories/revision/nuiton-web/193 Log: Upgrade to mavenpom 3.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 14:34:11 UTC (rev 192) +++ trunk/pom.xml 2012-02-29 11:32:21 UTC (rev 193) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1</version> + <version>3.1.1</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r192 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org Feb. 20, 2012

Feb. 20, 2012

Author: maven-release Date: 2012-02-20 15:34:11 +0100 (Mon, 20 Feb 2012) New Revision: 192 Url: http://nuiton.org/repositories/revision/nuiton-web/192 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2012-02-20 14:34:10 UTC (rev 191) +++ trunk/nuiton-gwt/pom.xml 2012-02-20 14:34:11 UTC (rev 192) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10</version> + <version>1.11-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-02-20 14:34:10 UTC (rev 191) +++ trunk/nuiton-rss/pom.xml 2012-02-20 14:34:11 UTC (rev 192) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10</version> + <version>1.11-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2012-02-20 14:34:10 UTC (rev 191) +++ trunk/nuiton-struts2/pom.xml 2012-02-20 14:34:11 UTC (rev 192) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10</version> + <version>1.11-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-02-20 14:34:10 UTC (rev 191) +++ trunk/nuiton-tapestry/pom.xml 2012-02-20 14:34:11 UTC (rev 192) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10</version> + <version>1.11-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-02-20 14:34:10 UTC (rev 191) +++ trunk/nuiton-web/pom.xml 2012-02-20 14:34:11 UTC (rev 192) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10</version> + <version>1.11-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 14:34:10 UTC (rev 191) +++ trunk/pom.xml 2012-02-20 14:34:11 UTC (rev 192) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10</version> + <version>1.11-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -318,11 +318,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.10</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.10 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.10</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> <distributionManagement>

1 0

r191 - tags
by maven-release＠users.nuiton.org Feb. 20, 2012

Feb. 20, 2012

Author: maven-release Date: 2012-02-20 15:34:10 +0100 (Mon, 20 Feb 2012) New Revision: 191 Url: http://nuiton.org/repositories/revision/nuiton-web/191 Log: [maven-release-plugin] copy for tag nuiton-web-1.10 Added: tags/nuiton-web-1.10/

1 0

r190 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org Feb. 20, 2012

Feb. 20, 2012

Author: maven-release Date: 2012-02-20 15:34:09 +0100 (Mon, 20 Feb 2012) New Revision: 190 Url: http://nuiton.org/repositories/revision/nuiton-web/190 Log: [maven-release-plugin] prepare release nuiton-web-1.10 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2012-02-20 14:32:17 UTC (rev 189) +++ trunk/nuiton-gwt/pom.xml 2012-02-20 14:34:09 UTC (rev 190) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10-SNAPSHOT</version> + <version>1.10</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-02-20 14:32:17 UTC (rev 189) +++ trunk/nuiton-rss/pom.xml 2012-02-20 14:34:09 UTC (rev 190) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10-SNAPSHOT</version> + <version>1.10</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2012-02-20 14:32:17 UTC (rev 189) +++ trunk/nuiton-struts2/pom.xml 2012-02-20 14:34:09 UTC (rev 190) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10-SNAPSHOT</version> + <version>1.10</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-02-20 14:32:17 UTC (rev 189) +++ trunk/nuiton-tapestry/pom.xml 2012-02-20 14:34:09 UTC (rev 190) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10-SNAPSHOT</version> + <version>1.10</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-02-20 14:32:17 UTC (rev 189) +++ trunk/nuiton-web/pom.xml 2012-02-20 14:34:09 UTC (rev 190) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10-SNAPSHOT</version> + <version>1.10</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 14:32:17 UTC (rev 189) +++ trunk/pom.xml 2012-02-20 14:34:09 UTC (rev 190) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.10-SNAPSHOT</version> + <version>1.10</version> <modules> <module>nuiton-web</module> @@ -318,11 +318,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.10</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.10 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.10</url> </scm> <distributionManagement>

1 0

r189 - trunk
by tchemit＠users.nuiton.org Feb. 20, 2012

Feb. 20, 2012

Author: tchemit Date: 2012-02-20 15:32:17 +0100 (Mon, 20 Feb 2012) New Revision: 189 Url: http://nuiton.org/repositories/revision/nuiton-web/189 Log: T?\195?\162che #1975: Updates to ToPIA 2.6.7 and hibernate 3.6.10 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 13:44:38 UTC (rev 188) +++ trunk/pom.xml 2012-02-20 14:32:17 UTC (rev 189) @@ -141,7 +141,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.6.8.Final</version> + <version>3.6.10.Final</version> <scope>provided</scope> </dependency> @@ -244,7 +244,7 @@ <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.6.7-SNAPSHOT</topiaVersion> + <topiaVersion>2.6.7</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r188 - trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table
by tchemit＠users.nuiton.org Feb. 20, 2012

Feb. 20, 2012

Author: tchemit Date: 2012-02-20 14:44:38 +0100 (Mon, 20 Feb 2012) New Revision: 188 Url: http://nuiton.org/repositories/revision/nuiton-web/188 Log: remove System.out + implements Serializable properly (on some classes) Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/AbstractGWTTableModel.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/DefaultTableModel.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/GWTTableModel.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelEvent.java Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/AbstractGWTTableModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/AbstractGWTTableModel.java 2012-02-20 11:49:09 UTC (rev 187) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/AbstractGWTTableModel.java 2012-02-20 13:44:38 UTC (rev 188) @@ -31,9 +31,9 @@ * @author jcouteau * @since 1.1 */ -public abstract class AbstractGWTTableModel implements Serializable, GWTTableModel{ +public abstract class AbstractGWTTableModel implements GWTTableModel { - static final long serialVersionUID = -5798593159423650347L; + private static final long serialVersionUID = -5798593159423650347L; /** * Storage for the listeners registered with this model. Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/DefaultTableModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/DefaultTableModel.java 2012-02-20 11:49:09 UTC (rev 187) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/DefaultTableModel.java 2012-02-20 13:44:38 UTC (rev 188) @@ -51,10 +51,9 @@ * * @author Andrew Selkirk */ -public class DefaultTableModel extends AbstractGWTTableModel - implements Serializable { +public class DefaultTableModel extends AbstractGWTTableModel { - static final long serialVersionUID=6680042567037222321L; + private static final long serialVersionUID = 6680042567037222321L; /** * Storage for the rows in the table (each row is itself Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/GWTTableModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/GWTTableModel.java 2012-02-20 11:49:09 UTC (rev 187) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/GWTTableModel.java 2012-02-20 13:44:38 UTC (rev 188) @@ -22,11 +22,13 @@ package org.nuiton.web.gwt.table; +import java.io.Serializable; + /** * @author jcouteau * @since 1.1 */ -public interface GWTTableModel { +public interface GWTTableModel extends Serializable { int getRowCount(); Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java 2012-02-20 11:49:09 UTC (rev 187) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java 2012-02-20 13:44:38 UTC (rev 188) @@ -36,6 +36,8 @@ public class SortableTableModel extends AbstractGWTTableModel implements Serializable , TableModelListener { + private static final long serialVersionUID = 1L; + protected GWTTableModel model; /** The sorted column, -1 means no sorting **/ @@ -158,9 +160,7 @@ } protected void initRowsOrder() { - - System.out.println("init rows order"); - + int rowCount = model.getRowCount(); rowsOrder = new int[rowCount]; for (int i = 0;i<rowCount;i++) { Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelEvent.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelEvent.java 2012-02-20 11:49:09 UTC (rev 187) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelEvent.java 2012-02-20 13:44:38 UTC (rev 188) @@ -53,6 +53,7 @@ /** Specifies all columns in a row or rows. */ public static final int ALL_COLUMNS = -1; + private static final long serialVersionUID = 1L; protected int column; protected int firstRow;

1 0

r187 - in trunk: . nuiton-web/src/main/java/org/nuiton/web/filter
by tchemit＠users.nuiton.org Feb. 20, 2012

Feb. 20, 2012

Author: tchemit Date: 2012-02-20 12:49:09 +0100 (Mon, 20 Feb 2012) New Revision: 187 Url: http://nuiton.org/repositories/revision/nuiton-web/187 Log: T?\195?\162che #1975: Updates to ToPIA 2.6.7 Evolution #1978: Can use request to begin a new transaction in TopiatransactionFilter Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java trunk/pom.xml Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2012-02-19 11:51:08 UTC (rev 186) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2012-02-20 11:49:09 UTC (rev 187) @@ -76,7 +76,7 @@ * <h2>Obtain the transaction</h2> * The (proxied) transaction is pushed as an attribute in the servlet request. * <p/> - * The attribute name is defined by field {@link #requestAttribute} + * The attribute name is defined by field {@link #requestAttributeName} * (default value is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be * changed. * <p/> @@ -89,7 +89,7 @@ * <pre> * TopiaContext tx = (TopiaContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); * </pre> - * + * <p/> * Or * <pre> * TopiaContext tx = (TopiaContext) request.getAttribute(modifiedAttributeName); @@ -138,7 +138,7 @@ * * @since 1.10 */ - protected String requestAttribute = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; + protected String requestAttributeName = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; public Set<String> getExcludeMethods() { return excludeMethods; @@ -149,13 +149,14 @@ } /** - * to change the {@link #requestAttribute}. + * to change the {@link #requestAttributeName}. * - * @param requestAttribute new name of the request attribute where to push the transaction. + * @param requestAttributeName new name of the request attribute + * where to push the transaction. * @since 1.10 */ - public void setRequestAttribute(String requestAttribute) { - this.requestAttribute = requestAttribute; + public void setRequestAttributeName(String requestAttributeName) { + this.requestAttributeName = requestAttributeName; } public static TopiaContext getTransaction(ServletRequest request) { @@ -167,10 +168,11 @@ /** * Method to open a new transaction. * + * @param request incoming request * @return the new freshly opened transaction * @throws TopiaRuntimeException if any problem while opening a new transaction */ - protected abstract TopiaContext beginTransaction() throws TopiaRuntimeException; + protected abstract TopiaContext beginTransaction(ServletRequest request) throws TopiaRuntimeException; @Override public void destroy() { @@ -209,7 +211,7 @@ // creates a proxy of a lazy transaction TopiaTransactionProxyInvocationHandler proxyInvocationHandler = - new TopiaTransactionProxyInvocationHandler(); + new TopiaTransactionProxyInvocationHandler(request); TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( getClass().getClassLoader(), @@ -219,7 +221,7 @@ ); // push it in request as an attribute - request.setAttribute(requestAttribute, proxy); + request.setAttribute(requestAttributeName, proxy); try { // chain to next filter @@ -349,9 +351,16 @@ */ public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { + /** Incoming request that creates this handler. */ + protected final ServletRequest request; + /** Target to use for the proxy. */ protected TopiaContext transaction; + protected TopiaTransactionProxyInvocationHandler(ServletRequest request) { + this.request = request; + } + @Override public Object invoke(Object proxy, Method method, @@ -378,7 +387,7 @@ } // first time transaction is required, create its - transaction = beginTransaction(); + transaction = beginTransaction(request); if (log.isDebugEnabled()) { log.debug("Open transaction " + transaction); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-19 11:51:08 UTC (rev 186) +++ trunk/pom.xml 2012-02-20 11:49:09 UTC (rev 187) @@ -244,7 +244,7 @@ <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.6.6</topiaVersion> + <topiaVersion>2.6.7-SNAPSHOT</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r186 - trunk/nuiton-rss/src/license
by tchemit＠users.nuiton.org Feb. 19, 2012

Feb. 19, 2012

Author: tchemit Date: 2012-02-19 12:51:08 +0100 (Sun, 19 Feb 2012) New Revision: 186 Url: http://nuiton.org/repositories/revision/nuiton-web/186 Log: update third-parties Modified: trunk/nuiton-rss/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-rss/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2012-02-19 11:19:30 UTC (rev 185) +++ trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2012-02-19 11:51:08 UTC (rev 186) @@ -3,9 +3,11 @@ # Already used licenses in project : # - Apache Software License Like # - BSD License +# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License @@ -15,6 +17,7 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 07:24:15 CEST 2011 +#Sun Feb 19 12:50:29 CET 2012 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 org.jdom--jdom--1.1=Apache Software License Like

1 0

r185 - in trunk/nuiton-rss: . src/main/java/org/nuiton/rss src/test src/test/java src/test/java/org/nuiton/rss src/test/resources
by tchemit＠users.nuiton.org Feb. 19, 2012

Feb. 19, 2012

Author: tchemit Date: 2012-02-19 12:19:30 +0100 (Sun, 19 Feb 2012) New Revision: 185 Url: http://nuiton.org/repositories/revision/nuiton-web/185 Log: Anomalie #1974: nuiton-rss tests are not isolated (and are not self-contained by project) Added: trunk/nuiton-rss/src/test/resources/ trunk/nuiton-rss/src/test/resources/log4j.properties Removed: trunk/nuiton-rss/src/test/java/resources/ Modified: trunk/nuiton-rss/pom.xml trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-02-18 16:03:59 UTC (rev 184) +++ trunk/nuiton-rss/pom.xml 2012-02-19 11:19:30 UTC (rev 185) @@ -56,6 +56,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> </dependency> Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java 2012-02-18 16:03:59 UTC (rev 184) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java 2012-02-19 11:19:30 UTC (rev 185) @@ -62,16 +62,27 @@ public static final DateFormat DATE_PARSER = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); /** + * @param generatorDirectory generator directory * @return une nouvelle instance de RssHelper en utilisant les implantations * definies dans RSSGeneratorConfig. * @throws Exception pour tout pb lors de l'instanciation des objects */ - public static RSSGenerator newDefaultInstance() throws Exception { + public static RSSGenerator newDefaultInstance(File generatorDirectory) throws Exception { RSSGenerator helper = new RSSGenerator(); return helper; } + /** + * @return une nouvelle instance de RssHelper en utilisant les implantations + * definies dans RSSGeneratorConfig. + * @throws Exception pour tout pb lors de l'instanciation des objects + */ + public static RSSGenerator newDefaultInstance() throws Exception { + RSSGenerator helper = newDefaultInstance(null); + return helper; + } + /** * dictonnary of field <-> property for feed */ Modified: trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2012-02-18 16:03:59 UTC (rev 184) +++ trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2012-02-19 11:19:30 UTC (rev 185) @@ -31,7 +31,10 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestName; +import org.nuiton.util.FileUtil; import java.io.File; import java.net.MalformedURLException; @@ -42,24 +45,38 @@ import java.util.List; import java.util.Map; -/** - * @author tony - */ +/** @author tony */ public class RSSGeneratorHelperTest { private static Log log = LogFactory.getLog(RSSGeneratorHelperTest.class); - static RSSGenerator helper; - static File f; + private static final long TIMESTAMP = System.nanoTime(); + RSSGenerator helper; + + File f; + + @Rule + public TestName testMethodName = new TestName(); + @Before public void setUp() throws Exception { - if (helper == null) { - helper = RSSGenerator.newDefaultInstance(); + String base = System.getProperty("java.io.tmpdir"); + if (base == null || base.isEmpty()) { + base = new File("").getAbsolutePath(); } - if (f == null) { - f = getFeedFile(); + File testBasedir = new File(base); + if (log.isInfoEnabled()) { + log.info("basedir for test " + testBasedir); } + File testdir = FileUtil.getFileFromFQN(testBasedir, + getClass().getName() + "." + TIMESTAMP); + + helper = RSSGenerator.newDefaultInstance(testdir); + + + f = getFeedFile(); + } @Test @@ -106,6 +123,8 @@ @Test public void testCreateFeedAlreadyExisting() throws Exception { + testCreateFeed(); + Map<Field, Object> values = new HashMap<Field, Object>(); values.put(Field.NAME, "feedName : " + f.getName()); values.put(Field.DESCRIPTION, "feedDescription : " + f.getName()); @@ -128,6 +147,9 @@ @Test public void testAddFeedEntry() throws Exception { + + testCreateFeed(); + Assert.assertTrue(f.exists()); Map<Field, Object> values = createEntry(0); @@ -150,6 +172,8 @@ @Test public void testAddFeedEntryToMax() throws Exception { + testAddFeedEntry(); + Assert.assertTrue(f.exists()); SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); @@ -197,6 +221,7 @@ @Test public void testCleanFile() throws Exception { + testCreateFeed(); try { Assert.assertNotNull(f); Assert.assertTrue(f.exists()); Copied: trunk/nuiton-rss/src/test/resources/log4j.properties (from rev 183, trunk/nuiton-rss/src/test/java/resources/log4j.properties) =================================================================== --- trunk/nuiton-rss/src/test/resources/log4j.properties (rev 0) +++ trunk/nuiton-rss/src/test/resources/log4j.properties 2012-02-19 11:19:30 UTC (rev 185) @@ -0,0 +1,31 @@ +### +# #%L +# Nuiton Utils :: Nuiton RSS +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +# Global logging configuration +log4j.rootLogger=INFO, stdout + +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n Property changes on: trunk/nuiton-rss/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r184 - trunk/nuiton-web/src/main/java/org/nuiton/web/filter
by tchemit＠users.nuiton.org Feb. 18, 2012

Feb. 18, 2012

Author: tchemit Date: 2012-02-18 17:03:59 +0100 (Sat, 18 Feb 2012) New Revision: 184 Url: http://nuiton.org/repositories/revision/nuiton-web/184 Log: Evolution #1973: Can customize request attribute name to use in TransactionFilter Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2012-02-08 10:16:43 UTC (rev 183) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2012-02-18 16:03:59 UTC (rev 184) @@ -76,9 +76,11 @@ * <h2>Obtain the transaction</h2> * The (proxied) transaction is pushed as an attribute in the servlet request. * <p/> - * The attribute name is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. + * The attribute name is defined by field {@link #requestAttribute} + * (default value is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be + * changed. * <p/> - * A convience method is created here to obtain the transaction {@link #getTransaction(ServletRequest)} : + * A convience method is created here to obtain the transaction {@link #getTransaction(ServletRequest)} : * <pre> * TopiaContext tx = TopiaTransactionFilter.getTransaction(ServletRequest); * </pre> @@ -88,6 +90,11 @@ * TopiaContext tx = (TopiaContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); * </pre> * + * Or + * <pre> + * TopiaContext tx = (TopiaContext) request.getAttribute(modifiedAttributeName); + * </pre> + * * @author tchemit <chemit(a)codelutin.com> * @since 1.6 */ @@ -123,6 +130,16 @@ /** names of methods to by-pass if no transaction opened on proxy. */ protected Set<String> unusedMethods; + /** + * Name of the request attribute where to push the transaction. + * <p/> + * By default will use value of + * {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. + * + * @since 1.10 + */ + protected String requestAttribute = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; + public Set<String> getExcludeMethods() { return excludeMethods; } @@ -131,6 +148,16 @@ return unusedMethods; } + /** + * to change the {@link #requestAttribute}. + * + * @param requestAttribute new name of the request attribute where to push the transaction. + * @since 1.10 + */ + public void setRequestAttribute(String requestAttribute) { + this.requestAttribute = requestAttribute; + } + public static TopiaContext getTransaction(ServletRequest request) { TopiaContext topiaContext = (TopiaContext) request.getAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); @@ -187,12 +214,12 @@ TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( getClass().getClassLoader(), new Class<?>[]{TopiaContext.class, - TopiaContextImplementor.class}, + TopiaContextImplementor.class}, proxyInvocationHandler ); // push it in request as an attribute - request.setAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE, proxy); + request.setAttribute(requestAttribute, proxy); try { // chain to next filter @@ -221,7 +248,7 @@ // not authorized throw new IllegalAccessException( "Not allowed to access method " + method.getName() + " on " + - proxy); + proxy); } /** @@ -283,7 +310,7 @@ String methodName = method.getName(); if (log.isDebugEnabled()) { log.debug("Skip execution of method " + methodName + - " since no transaction is instanciated."); + " since no transaction is instanciated."); } Set<String> methods = getUnusedMethods();

1 0