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

r121 - in trunk/nuiton-struts2: . src/main/java/org/nuiton/web/struts2 src/main/java/org/nuiton/web/struts2/filter src/main/java/org/nuiton/web/struts2/interceptor
by bleny＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: bleny Date: 2011-10-28 18:00:53 +0200 (Fri, 28 Oct 2011) New Revision: 121 Url: http://nuiton.org/repositories/revision/nuiton-web/121 Log: #1789, #1790, #1791, introduce CloseTopiaTransactionFilter and OpenTopiaTransactionInterceptor, deprecate TopiaTransactionInterceptor Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java Modified: trunk/nuiton-struts2/pom.xml trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-09-22 17:27:59 UTC (rev 120) +++ trunk/nuiton-struts2/pom.xml 2011-10-28 16:00:53 UTC (rev 121) @@ -20,10 +20,10 @@ <dependencies> -  + </dependency> <dependency> <groupId>org.apache.struts.xwork</groupId> @@ -51,6 +51,11 @@ </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2011-10-28 16:00:53 UTC (rev 121) @@ -0,0 +1,73 @@ +package org.nuiton.web.struts2.filter; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.web.struts2.interceptor.OpenTopiaTransactionInterceptor; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import java.io.IOException; + +/** Close a TopiaTransaction instance stored in the servlet context. + * + * The main usage is to close a transaction opened by the + * {@link OpenTopiaTransactionInterceptor}. A convention is used to find it, + * the transaction attached to the request is found at key + * {@link OpenTopiaTransactionInterceptor#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE} + * + * @since 1.5 + * @author bleny + */ +public class CloseTopiaTransactionFilter implements Filter { + + /** Logger. */ + private static final Log log = LogFactory.getLog(CloseTopiaTransactionFilter.class); + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + try { + filterChain.doFilter(servletRequest, servletResponse); + } finally { + TopiaContext transaction = (TopiaContext) + servletRequest.getAttribute( + OpenTopiaTransactionInterceptor.TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + + if (transaction == null) { + if (log.isTraceEnabled()) { + log.trace("no transaction to close"); + } + } else if (transaction.isClosed()) { + if (log.isTraceEnabled()) { + log.trace("transaction " + transaction + " is already closed"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("close transaction " + transaction); + } + try { + transaction.closeContext(); + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } + } + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + // nothing to do + } + + @Override + public void destroy() { + // nothing to do + } +} Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2011-10-28 16:00:53 UTC (rev 121) @@ -0,0 +1,235 @@ +package org.nuiton.web.struts2.interceptor; + +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.ServletActionContext; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaTransactionAware; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + *  + * <p/> + * The aim of this Interceptor is to manage a {@code transaction} all along + * a action which implements {@link TopiaTransactionAware} contract. + * <p/> + * Technicaly, the action will receive only a proxy of a transaction and a real + * transaction will only be created as soon as a method will be asked on it. + * <p/> + * The interceptor is abstract and let user to implement the way how to open a + * new transaction via the method {@link #beginTransaction()}. + * <p/> + * Note that the transaction pushed in the action can be limited using a list + * of methods to exclude on it. The list of methods to forbid can be customized + * using the interceptor parameter {@link #excludeMethods}. + * <p/> + * Note also that the transaction is <strong>not</strong> commited nor closed. + * If you want the transaction to be closed, you may use + * {@link org.nuiton.web.struts2.filter.CloseTopiaTransactionFilter} by adding + * it to your web.xml file. + * <p/> + * This interceptor, as it provides connection to database should be in the + * interceptor stack before any other interceptor requiring access to database. + * For example, it is a common behaviour to do such calls in a prepare method, + * so make sure to place this interceptor before the {@code prepare} interceptor. + *  + * <p/> + * <p/> <u>Interceptor parameters:</u> + * <p/> + *  + * <p/> + * <ul> + * <li>excludeMethods (optional) - Customized method names separated by coma to + * forbid on the proxy of the transaction given to action. By default, if this + * parameter is not filled, then we will use this one : + * {@link #DEFAULT_EXCLUDE_METHODS}.</li> + * </ul> + * <p/> + *  + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public abstract class OpenTopiaTransactionInterceptor extends AbstractInterceptor { + + /** To specify on your action that you never want any commit. */ + @Retention(RetentionPolicy.RUNTIME) + @Target({ElementType.TYPE, ElementType.METHOD}) + public @interface NoCommit { + } + + /** Logger. */ + private static final Log log = + LogFactory.getLog(OpenTopiaTransactionInterceptor.class); + + private static final long serialVersionUID = 1L; + + public static final String TOPIA_TRANSACTION_REQUEST_ATTRIBUTE = "topiaTransaction"; + + public static final String[] DEFAULT_EXCLUDE_METHODS = { + "beginTransaction", + "closeContext", + "clear" + }; + + /** names of methods to forbid access while using proxy. */ + protected Set<String> excludeMethods; + + public Set<String> getExcludeMethods() { + return excludeMethods; + } + + public void setExcludeMethods(String excludeMethods) { + this.excludeMethods = + TextParseUtil.commaDelimitedStringToSet(excludeMethods); + } + + /** + * Method to open a new transaction. + * + * @return the new freshly opened transaction + * @throws org.nuiton.topia.TopiaException if any problem while opening a new transaction + */ + protected abstract TopiaContext beginTransaction() throws TopiaException; + + @Override + public void init() { + super.init(); + + if (getExcludeMethods() == null) { + + // use default exclude methods + excludeMethods = new HashSet<String>( + Arrays.asList(DEFAULT_EXCLUDE_METHODS) + ); + } + } + + /** + * @deprecated to be removed in the same time as TopiaTransactionInterceptor + */ + @Deprecated + protected void closeTransaction(TopiaContext transaction, Object action, + ActionInvocation invocation) throws TopiaException { + // do nothing by contract + } + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + + TopiaTransactionAware transactionAware = null; + + Object action = invocation.getProxy().getAction(); + + if (action instanceof TopiaTransactionAware) { + transactionAware = (TopiaTransactionAware) action; + } + + if (transactionAware == null) { + + // not a transaction aware action, direct skip this interceptor + return invocation.invoke(); + } + + // creates a proxy of a lazy transaction + + TopiaTransactionProxyInvocationHandler proxyInvocationHandler = + new TopiaTransactionProxyInvocationHandler(); + + TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{TopiaContext.class, + TopiaContextImplementor.class}, + proxyInvocationHandler + ); + + // set the transaction in the action + transactionAware.setTransaction(proxy); + + try { + + return invocation.invoke(); + + } finally { + + closeTransaction(proxyInvocationHandler.getTransaction(), action, invocation); + + } + } + + /** + * Handler of a proxy on a {@link TopiaContext}. + * + * @see #excludeMethods + */ + public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { + + /** Target to use for the proxy. */ + protected TopiaContext transaction; + + public TopiaContext getTransaction() { + return transaction; + } + + @Override + public Object invoke(Object proxy, + Method method, + Object[] args) throws Throwable { + + String methodName = method.getName(); + + if (getExcludeMethods().contains(methodName)) { + + // not authorized + throw new IllegalAccessException( + "Not allowed to access method " + methodName + " on " + + proxy); + } + + if (transaction == null) { + + if (log.isTraceEnabled()) { + log.trace("transaction started due to a call to " + methodName); + } + + // first time transaction is required, create its + transaction = beginTransaction(); + + // push transaction in request to make it available for closing in + // CloseTopiaTransactionFilter + ServletActionContext.getRequest().setAttribute( + TOPIA_TRANSACTION_REQUEST_ATTRIBUTE, transaction); + + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); + } + } + + // can invoke the method on the transaction + try { + Object result = method.invoke(transaction, args); + return result; + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Could not execute method " + method.getName(), eee); + } + throw eee; + } + } + } +} Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-09-22 17:27:59 UTC (rev 120) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-10-28 16:00:53 UTC (rev 121) @@ -25,206 +25,56 @@ package org.nuiton.web.struts2.interceptor; import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.util.TextParseUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaTransactionAware; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; -/** - *  - * <p/> - * The aim of this Interceptor is to manage a {@code transaction} all along - * a action which implements {@link TopiaTransactionAware} - * contract. - * <p/> - * Technicaly, the action will receive only a proxy of a transaction and a real - * transaction will only be created as soon as a method will be asked on it. - * <p/> - * The interceptor is abstract and let user to implement the way how to open a - * new transaction via the method {@link #beginTransaction()}. - * <p/> - * Note that the transaction pushed in the action can be limited using a list - * of methods to exclude on it. The list of methods to forbid can be customized - * using the interceptor parameter {@link #excludeMethods}. - * <p/> - * Note also that the transaction is commited and closed after all stack of - * interceptor consumed, this means that the transaction will still be opened - * while rendering the result, this is a particular interesting thing to avoid - * pre-loading of entities due to lazy strategy of hibernate for example. - * With this mecanism you can feel free to just obtain the obtain from database - * via a DAO and then really load it in the rendering result. - * <p/> - * If you do not want any commit for a given action, just put on the class a commit - * <p/> - * This interceptor, as it provides connection to database should be in the - * interceptor stack before any other interceptor requiring access to database. - * For example, it is a common behaviour to do such calls in a prepare method, - * so make sure to place this interceptor before the {@code prepare} interceptor. - *  - * <p/> - * <p/> <u>Interceptor parameters:</u> - * <p/> - *  - * <p/> - * <ul> - * <li>excludeMethods (optional) - Customized method names separated by coma to - * forbid on the proxy of the transaction given to action. By default, if this - * parameter is not filled, then we will use this one : - * {@link #DEFAULT_EXCLUDE_METHODS}.</li> - * </ul> - * <p/> - *  +/** Same interceptor as {@link OpenTopiaTransactionInterceptor} but close + * the transaction after action is called. The transaction will be commited + * (unless asked otherwise) and closed. * * @author tchemit <chemit(a)codelutin.com> * @since 1.2 */ -public abstract class TopiaTransactionInterceptor extends AbstractInterceptor { +@Deprecated +public abstract class TopiaTransactionInterceptor extends OpenTopiaTransactionInterceptor { - /** To specify on your action that you never want any commit. */ - @Retention(RetentionPolicy.RUNTIME) - @Target({ElementType.TYPE, ElementType.METHOD}) - public @interface NoCommit { - } - /** Logger. */ - private static final Log log = - LogFactory.getLog(TopiaTransactionInterceptor.class); + private static final Log log = LogFactory.getLog(TopiaTransactionInterceptor.class); - private static final long serialVersionUID = 1L; - - public static final String[] DEFAULT_EXCLUDE_METHODS = { - "beginTransaction", - "closeContext", - "clear" - }; - - /** names of methods to forbid access while using proxy. */ - protected Set<String> excludeMethods; - - public Set<String> getExcludeMethods() { - return excludeMethods; - } - - public void setExcludeMethods(String excludeMethods) { - this.excludeMethods = - TextParseUtil.commaDelimitedStringToSet(excludeMethods); - } - - /** - * Method to open a new transaction. - * - * @return the new freshly opened transaction - * @throws TopiaException if any problem while opening a new transaction - */ - protected abstract TopiaContext beginTransaction() throws TopiaException; - @Override - public void init() { - super.init(); + protected void closeTransaction(TopiaContext transaction, Object action, + ActionInvocation invocation) throws TopiaException { - if (getExcludeMethods() == null) { + boolean commitNeeded = isCommitNeeded(action, invocation); - // use default exclude methods - excludeMethods = new HashSet<String>( - Arrays.asList(DEFAULT_EXCLUDE_METHODS) - ); - } - } + if (transaction != null && ! transaction.isClosed()) { + try { + if (commitNeeded) { - @Override - public String intercept(ActionInvocation invocation) throws Exception { - - TopiaTransactionAware transactionAware = null; - - Object action = invocation.getProxy().getAction(); - - if (action instanceof TopiaTransactionAware) { - transactionAware = (TopiaTransactionAware) action; - } - - if (transactionAware == null) { - - // not a transaction aware action, direct skip this interceptor - return invocation.invoke(); - } - - // creates a proxy of a lazy transaction - - TopiaTransactionProxyInvocationHandler proxyInvocationHandler = - new TopiaTransactionProxyInvocationHandler(); - - TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( - getClass().getClassLoader(), - new Class<?>[]{TopiaContext.class, - TopiaContextImplementor.class}, - proxyInvocationHandler - ); - - // set the transaction in the action - transactionAware.setTransaction(proxy); - - boolean doCommit = isCommitNeeded(action, invocation); - try { - return invocation.invoke(); - } catch (Exception e) { - - doCommit = false; - TopiaContext transaction = proxyInvocationHandler.getTransaction(); - - if (transaction != null && !transaction.isClosed()) { - if (log.isDebugEnabled()) { - log.debug("rollback transaction " + transaction); - } - transaction.rollbackTransaction(); - } - - throw e; - } finally { - - TopiaContext transaction = proxyInvocationHandler.getTransaction(); - - if (transaction != null && !transaction.isClosed()) { - try { - if (doCommit) { - - // commit the opened transaction - if (log.isDebugEnabled()) { - log.debug("Commit transaction " + transaction); - } - transaction.commitTransaction(); - } - } finally { - - // close the opened transaction + // commit the opened transaction if (log.isDebugEnabled()) { - log.debug("Close transaction " + transaction); + log.debug("Commit transaction " + transaction); } - transaction.closeContext(); + transaction.commitTransaction(); } + } finally { + // close the opened transaction + if (log.isDebugEnabled()) { + log.debug("Close transaction " + transaction); + } + transaction.closeContext(); } - } } protected boolean isCommitNeeded(Object action, - ActionInvocation invocation) throws NoSuchMethodException { + ActionInvocation invocation) { Class<?> actionType = action.getClass(); boolean noCommit = actionType.isAnnotationPresent(NoCommit.class); if (noCommit) { @@ -244,7 +94,12 @@ // no methodName specify, means the execute one methodName = "execute"; } - Method method = actionType.getMethod(methodName); + Method method; + try { + method = actionType.getMethod(methodName); + } catch (NoSuchMethodException e) { + throw new RuntimeException(e); + } noCommit = method.isAnnotationPresent(NoCommit.class); if (noCommit) { if (log.isDebugEnabled()) { @@ -255,55 +110,4 @@ return !noCommit; } - /** - * Handler of a proxy on a {@link TopiaContext}. - * - * @see TopiaTransactionInterceptor#excludeMethods - */ - public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { - - /** Target to use for the proxy. */ - protected TopiaContext transaction; - - public TopiaContext getTransaction() { - return transaction; - } - - @Override - public Object invoke(Object proxy, - Method method, - Object[] args) throws Throwable { - - String methodName = method.getName(); - - if (getExcludeMethods().contains(methodName)) { - - // not authorized - throw new IllegalAccessException( - "Not allowed to access method " + methodName + " on " + - proxy); - } - - if (transaction == null) { - - // first time transaction is required, create its - transaction = beginTransaction(); - - if (log.isDebugEnabled()) { - log.debug("Open transaction " + transaction); - } - } - // can invoke the method on the transaction - try { - Object result = method.invoke(transaction, args); - return result; - } catch (Exception eee) { - if (log.isErrorEnabled()) { - log.error("Could not execute method " + method.getName(), eee); - } - throw eee; - } - } - } - } \ No newline at end of file

1 0

r120 - trunk
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 19:27:59 +0200 (Thu, 22 Sep 2011) New Revision: 120 Url: http://nuiton.org/repositories/revision/nuiton-web/120 Log: Update mavenpom4redmineAndCentral to 3.0.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 13:20:36 UTC (rev 119) +++ trunk/pom.xml 2011-09-22 17:27:59 UTC (rev 120) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r119 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 15:20:36 +0200 (Thu, 22 Sep 2011) New Revision: 119 Url: http://nuiton.org/repositories/revision/nuiton-web/119 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 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/nuiton-gwt/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/nuiton-rss/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/nuiton-struts2/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/nuiton-tapestry/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/nuiton-web/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -298,11 +298,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.4</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-parent-1.4 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> <distributionManagement>

1 0

r118 - tags
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 15:20:35 +0200 (Thu, 22 Sep 2011) New Revision: 118 Url: http://nuiton.org/repositories/revision/nuiton-web/118 Log: [maven-release-plugin] copy for tag nuiton-web-parent-1.4 Added: tags/nuiton-web-parent-1.4/

1 0

r117 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 15:20:33 +0200 (Thu, 22 Sep 2011) New Revision: 117 Url: http://nuiton.org/repositories/revision/nuiton-web/117 Log: [maven-release-plugin] prepare release nuiton-web-parent-1.4 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 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/nuiton-gwt/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/nuiton-rss/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/nuiton-struts2/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/nuiton-tapestry/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/nuiton-web/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> <modules> <module>nuiton-web</module> @@ -298,11 +298,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-parent-1.4</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.4 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> </scm> <distributionManagement>

1 0

r116 - in trunk: . nuiton-web/src/site/apt
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 14:57:16 +0200 (Thu, 22 Sep 2011) New Revision: 116 Url: http://nuiton.org/repositories/revision/nuiton-web/116 Log: use properties to fill documentation by magic :) Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm trunk/pom.xml Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm 2011-09-22 12:33:04 UTC (rev 115) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm 2011-09-22 12:57:16 UTC (rev 116) @@ -64,13 +64,13 @@ <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-runner</artifactId> - <version>8.0.1.v20110908</version> + <version>${jettyVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>${servletApiVersion}</version> <scope>provided</scope> </dependency> ------------------------------------------------ @@ -124,7 +124,7 @@ <dependency> <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> - <version>0.9.10-hudson-24</version> + <version>${windstoneVersion}</version> <scope>provided</scope> </dependency> ------------------------------------------------ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 12:33:04 UTC (rev 115) +++ trunk/pom.xml 2011-09-22 12:57:16 UTC (rev 116) @@ -34,13 +34,13 @@ <dependency> <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> - <version>0.9.10-hudson-24</version> + <version>${windstoneVersion}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> - <version>7.1.0.v20100505</version> + <version>${jettyVersion}</version> </dependency>  @@ -104,7 +104,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>${servletApiVersion}</version> <scope>provided</scope> </dependency> @@ -148,7 +148,7 @@ <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> - <version>2.5.0</version> + <version>3.1.0</version> </dependency> <dependency> @@ -237,6 +237,10 @@  <struts2Version>2.2.3.1</struts2Version> + <servletApiVersion>2.5</servletApiVersion> + <jettyVersion>8.0.1.v20110908</jettyVersion> + <windstoneVersion>0.9.10-hudson-24</windstoneVersion> +  <siteLocales>en,fr</siteLocales>

1 0

r115 - in trunk: . nuiton-web nuiton-web/src/site/apt
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 14:33:04 +0200 (Thu, 22 Sep 2011) New Revision: 115 Url: http://nuiton.org/repositories/revision/nuiton-web/115 Log: T?\195?\162che #1750: Updates to Topia 2.6.2 T?\195?\162che #1749: Updates to struts 2.2.3.1 Evolution #1751: Updates war lanucher documentation Added: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm Removed: trunk/nuiton-web/src/site/apt/Warlauncher.apt Modified: trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-09-11 14:07:56 UTC (rev 114) +++ trunk/nuiton-web/pom.xml 2011-09-22 12:33:04 UTC (rev 115) @@ -47,8 +47,6 @@   - <packaging>jar</packaging> - <properties>  Deleted: trunk/nuiton-web/src/site/apt/Warlauncher.apt =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt 2011-09-11 14:07:56 UTC (rev 114) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt 2011-09-22 12:33:04 UTC (rev 115) @@ -1,169 +0,0 @@ -~~~ -~~ #%L -~~ Nuiton Web :: Nuiton Web -~~ -~~ $Id$ -~~ $HeadURL$ -~~ %% -~~ Copyright (C) 2011 CodeLutin, Chatellier Eric -~~ %% -~~ 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% -~~~ - ------ - War launcher - ------ - - -War launcher - -* Features - - * Start embedded servlet container with current webapp - - * Favicon support - - * Systray with popup menu - -* Prerequisites - - By default, both jetty and winstone look for an icon named <<favicon.png>> or - <<favicon.jpg>> at webapp base. If none of this icons is found, system tray - won't work. - - In maven, by default, this file must be put in <<<src/main/webapp>>> directory. - - If <<<display-name>>> content can be read into <<<WEB-INF/web.xml>>> file, - it's used as server name (currently in systray tooltip). - -* Jetty based - -** Maven configuration - - Add following dependencies to your project. - ------------------------------------------------- -<dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web</artifactId> - <version>1.4</version> - <scope>provided</scope> -</dependency> -<dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <version>8.0.1.v20110908</version> - <scope>provided</scope> -</dependency> -<dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> -</dependency> ------------------------------------------------- - - They have to be both at least in <<<provided>>> scope. - - Then, you need to add following configuration into maven-war-plugin : - --------------------------------------------------------------------- -<plugin> - <artifactId>maven-war-plugin</artifactId> - <version>2.1.1</version> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web</artifactId> - <type>jar</type> - <includes> - <include>**/war/Jetty*</include> - </includes> - </overlay> - <overlay> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> -</plugin> --------------------------------------------------------------------- - -* Use Winstone war launcher - -** Maven configuration - - Add following dependencies to your project. - ------------------------------------------------- -<dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web</artifactId> - <version>1.4</version> - <scope>provided</scope> -</dependency> -<dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-24</version> - <scope>provided</scope> -</dependency> ------------------------------------------------- - - They have to be both at least in <<<provided>>> scope. - - Then, you need to add following configuration into maven-war-plugin : - --------------------------------------------------------------------- -<plugin> - <artifactId>maven-war-plugin</artifactId> - <version>2.1.1</version> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.web.war.WinstoneLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web</artifactId> - <type>jar</type> - <includes> - <include>**/war/Winstone*</include> - </includes> - </overlay> - <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> -</plugin> --------------------------------------------------------------------- - -** References - - * Winstone home : {{http://winstone.sourceforge.net}} - - * Winstone command line options : {{http://winstone.sourceforge.net/#commandLine}} Copied: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm (from rev 114, trunk/nuiton-web/src/site/apt/Warlauncher.apt) =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm (rev 0) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm 2011-09-22 12:33:04 UTC (rev 115) @@ -0,0 +1,169 @@ +~~~ +~~ #%L +~~ Nuiton Web :: Nuiton Web +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2011 CodeLutin, Chatellier Eric +~~ %% +~~ 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% +~~~ + ------ + War launcher + ------ + + +War launcher + +* Features + + * Start embedded servlet container with current webapp + + * Favicon support + + * Systray with popup menu + +* Prerequisites + + By default, both jetty and winstone look for an icon named <<favicon.png>> or + <<favicon.jpg>> at webapp base. If none of this icons is found, system tray + won't work. + + In maven, by default, this file must be put in <<<src/main/webapp>>> directory. + + If <<<display-name>>> content can be read into <<<WEB-INF/web.xml>>> file, + it's used as server name (currently in systray tooltip). + +* Jetty based + +** Maven configuration + + Add following dependencies to your project. + +------------------------------------------------ +<dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <version>${project.version}</version> + <scope>provided</scope> +</dependency> +<dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>8.0.1.v20110908</version> + <scope>provided</scope> +</dependency> +<dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> +</dependency> +------------------------------------------------ + + They have to be both at least in <<<provided>>> scope. + + Then, you need to add following configuration into maven-war-plugin : + +-------------------------------------------------------------------- +<plugin> + <artifactId>maven-war-plugin</artifactId> + <version>${warPluginVersion}</version> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <type>jar</type> + <includes> + <include>**/war/Jetty*</include> + </includes> + </overlay> + <overlay> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> +</plugin> +-------------------------------------------------------------------- + +* Use Winstone war launcher + +** Maven configuration + + Add following dependencies to your project. + +------------------------------------------------ +<dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <version>${project.version}</version> + <scope>provided</scope> +</dependency> +<dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-24</version> + <scope>provided</scope> +</dependency> +------------------------------------------------ + + They have to be both at least in <<<provided>>> scope. + + Then, you need to add following configuration into maven-war-plugin : + +-------------------------------------------------------------------- +<plugin> + <artifactId>maven-war-plugin</artifactId> + <version>${warPluginVersion}</version> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.web.war.WinstoneLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <type>jar</type> + <includes> + <include>**/war/Winstone*</include> + </includes> + </overlay> + <overlay> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> +</plugin> +-------------------------------------------------------------------- + +** References + + * Winstone home : {{http://winstone.sourceforge.net}} + + * Winstone command line options : {{http://winstone.sourceforge.net/#commandLine}} Property changes on: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-11 14:07:56 UTC (rev 114) +++ trunk/pom.xml 2011-09-22 12:33:04 UTC (rev 115) @@ -224,8 +224,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <jredminePluginVersion>1.2</jredminePluginVersion> - <topiaVersion>2.6.1</topiaVersion> + <topiaVersion>2.6.2</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion> @@ -236,7 +235,7 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.2.3</struts2Version> + <struts2Version>2.2.3.1</struts2Version>  <siteLocales>en,fr</siteLocales>

1 0

r114 - trunk/nuiton-web/src/site/apt
by echatellier＠users.nuiton.org 11 Sep '11

11 Sep '11

Author: echatellier Date: 2011-09-11 16:07:56 +0200 (Sun, 11 Sep 2011) New Revision: 114 Url: http://nuiton.org/repositories/revision/nuiton-web/114 Log: Update war launcher doc Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt 2011-09-09 16:05:23 UTC (rev 113) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt 2011-09-11 14:07:56 UTC (rev 114) @@ -5,7 +5,7 @@ ~~ $Id$ ~~ $HeadURL$ ~~ %% -~~ Copyright (C) 2011 CodeLutin +~~ Copyright (C) 2011 CodeLutin, Chatellier Eric ~~ %% ~~ This program is free software: you can redistribute it and/or modify ~~ it under the terms of the GNU Lesser General Public License as @@ -48,7 +48,7 @@ If <<<display-name>>> content can be read into <<<WEB-INF/web.xml>>> file, it's used as server name (currently in systray tooltip). -* Use Winstone war launcher +* Jetty based ** Maven configuration @@ -56,17 +56,23 @@ ------------------------------------------------ <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.3</version> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <version>1.4</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</version> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>8.0.1.v20110908</version> <scope>provided</scope> </dependency> +<dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> +</dependency> ------------------------------------------------ They have to be both at least in <<<provided>>> scope. @@ -76,25 +82,25 @@ -------------------------------------------------------------------- <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1-beta-1</version> + <version>2.1.1</version> <configuration> <archive> <manifest> - <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> + <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> </manifest> </archive> <overlays> <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> <type>jar</type> <includes> - <include>**/war/Winstone*</include> + <include>**/war/Jetty*</include> </includes> </overlay> <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> <type>jar</type> </overlay> </overlays> @@ -102,37 +108,25 @@ </plugin> -------------------------------------------------------------------- -** References +* Use Winstone war launcher - * Winstone home : {{http://winstone.sourceforge.net}} - - * Winstone command line options : {{http://winstone.sourceforge.net/#commandLine}} - -* Jetty based - ** Maven configuration Add following dependencies to your project. ------------------------------------------------ <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.3</version> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <version>1.4</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <version>7.1.0.v20100505</version> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-24</version> <scope>provided</scope> </dependency> -<dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> -</dependency> ------------------------------------------------ They have to be both at least in <<<provided>>> scope. @@ -142,33 +136,34 @@ -------------------------------------------------------------------- <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1-beta-1</version> + <version>2.1.1</version> <configuration> <archive> <manifest> - <mainClass>org.nuiton.util.war.JettyLauncher</mainClass> + <mainClass>org.nuiton.web.war.WinstoneLauncher</mainClass> </manifest> </archive> <overlays> <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> <type>jar</type> <includes> - <include>**/war/Jetty*</include> + <include>**/war/Winstone*</include> </includes> </overlay> <overlay> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> <type>jar</type> </overlay> - <overlay> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <type>jar</type> - </overlay> </overlays> </configuration> </plugin> -------------------------------------------------------------------- + +** References + + * Winstone home : {{http://winstone.sourceforge.net}} + + * Winstone command line options : {{http://winstone.sourceforge.net/#commandLine}}

1 0

r113 - trunk
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 18:05:23 +0200 (Fri, 09 Sep 2011) New Revision: 113 Url: http://nuiton.org/repositories/revision/nuiton-web/113 Log: use new site deployment configuration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 15:50:54 UTC (rev 112) +++ trunk/pom.xml 2011-09-09 16:05:23 UTC (rev 113) @@ -246,13 +246,6 @@ </properties> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - <build> <pluginManagement> @@ -309,4 +302,11 @@ <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + </project>

1 0

r112 - trunk
by maven-release＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: maven-release Date: 2011-09-09 17:50:54 +0200 (Fri, 09 Sep 2011) New Revision: 112 Url: http://nuiton.org/repositories/revision/nuiton-web/112 Log: Update mavenpom4redmineAndCentral to 3.0.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-23 13:02:30 UTC (rev 111) +++ trunk/pom.xml 2011-09-09 15:50:54 UTC (rev 112) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.2</version> + <version>3.0.3</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r111 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2
by tchemit＠users.nuiton.org 23 Aug '11

23 Aug '11

Author: tchemit Date: 2011-08-23 15:02:30 +0200 (Tue, 23 Aug 2011) New Revision: 111 Url: http://nuiton.org/repositories/revision/nuiton-web/111 Log: remove unused i18n method Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-08-19 16:29:24 UTC (rev 110) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-08-23 13:02:30 UTC (rev 111) @@ -37,12 +37,7 @@ public class BaseAction extends ActionSupport { private static final long serialVersionUID = 1L; - - public String _(String aTextName) { - String value = getText(aTextName); - return value; - } - + public String _(String key, Object... args) { String value = getText(key, Arrays.asList(args)); return value;

1 0

r110 - trunk
by tchemit＠users.nuiton.org 19 Aug '11

19 Aug '11

Author: tchemit Date: 2011-08-19 18:29:24 +0200 (Fri, 19 Aug 2011) New Revision: 110 Url: http://nuiton.org/repositories/revision/nuiton-web/110 Log: Update mavenpom4redmineAndCentral to 3.0.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 05:25:27 UTC (rev 109) +++ trunk/pom.xml 2011-08-19 16:29:24 UTC (rev 110) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r109 - in trunk: nuiton-rss/src/license nuiton-struts2/src/license nuiton-tapestry/src/license nuiton-web/src/license
by tchemit＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: tchemit Date: 2011-08-18 07:25:27 +0200 (Thu, 18 Aug 2011) New Revision: 109 Url: http://nuiton.org/repositories/revision/nuiton-web/109 Log: update third-parties Modified: trunk/nuiton-rss/src/license/THIRD-PARTY.properties trunk/nuiton-struts2/src/license/THIRD-PARTY.properties trunk/nuiton-tapestry/src/license/THIRD-PARTY.properties trunk/nuiton-web/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-rss/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2011-08-16 23:12:03 UTC (rev 108) +++ trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2011-08-18 05:25:27 UTC (rev 109) @@ -1,13 +1,20 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache Software License Like # - BSD License +# - 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 (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 12:16:27 CET 2010 -javax.servlet--servlet-api--2.5--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -org.jdom--jdom--1.1--jar=Apache Software License Like +#Thu Aug 18 07:24:15 CEST 2011 +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 Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-08-16 23:12:03 UTC (rev 108) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-08-18 05:25:27 UTC (rev 109) @@ -2,10 +2,13 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - 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 # - MPL 1.1 # - The Apache Software License, Version 2.0 # - http://asm.ow2.org/license.html @@ -14,12 +17,12 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jul 04 23:33:53 CEST 2011 -antlr--antlr--2.7.6--jar=BSD License -asm--asm--3.1--jar=http\://asm.ow2.org/license.html -asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html -asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1--jar=BSD License -javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -ognl--ognl--3.0.1--jar=The Apache Software License, Version 2.0 +#Thu Aug 18 07:24:14 CEST 2011 +antlr--antlr--2.7.6=BSD License +asm--asm--3.1=http\://asm.ow2.org/license.html +asm--asm-commons--3.1=http\://asm.ow2.org/license.html +asm--asm-tree--3.1=http\://asm.ow2.org/license.html +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +ognl--ognl--3.0.1=The Apache Software License, Version 2.0 Modified: trunk/nuiton-tapestry/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-tapestry/src/license/THIRD-PARTY.properties 2011-08-16 23:12:03 UTC (rev 108) +++ trunk/nuiton-tapestry/src/license/THIRD-PARTY.properties 2011-08-18 05:25:27 UTC (rev 109) @@ -1,10 +1,13 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache Software License 2.0 # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - LGPL 2.1 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 # - The Apache Software License, Version 2.0 @@ -12,5 +15,5 @@ # Please fill the missing licenses for dependencies : # # -#Wed Jan 26 16:04:35 CET 2011 -org.antlr--antlr-runtime--3.1.1--jar=BSD License +#Thu Aug 18 07:24:15 CEST 2011 +org.antlr--antlr-runtime--3.1.1=BSD License Modified: trunk/nuiton-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-web/src/license/THIRD-PARTY.properties 2011-08-16 23:12:03 UTC (rev 108) +++ trunk/nuiton-web/src/license/THIRD-PARTY.properties 2011-08-18 05:25:27 UTC (rev 109) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache Software License - Version 2.0 @@ -6,11 +6,15 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Lesser General Public License version 2.1 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jan 26 16:55:58 CET 2011 -javax.servlet--servlet-api--2.5--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +#Thu Aug 18 07:24:12 CEST 2011 +javax.servlet--servlet-api--2.5=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0

1 0

r108 - trunk
by tchemit＠users.nuiton.org 16 Aug '11

16 Aug '11

Author: tchemit Date: 2011-08-17 01:12:03 +0200 (Wed, 17 Aug 2011) New Revision: 108 Url: http://nuiton.org/repositories/revision/nuiton-web/108 Log: Update mavenpom4redmineAndCentral to 3.0.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-12 15:42:16 UTC (rev 107) +++ trunk/pom.xml 2011-08-16 23:12:03 UTC (rev 108) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0</version> + <version>3.0.1</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r107 - trunk/nuiton-struts2/src/main/resources/template/simple
by tchemit＠users.nuiton.org 12 Aug '11

12 Aug '11

Author: tchemit Date: 2011-08-12 17:42:16 +0200 (Fri, 12 Aug 2011) New Revision: 107 Url: http://nuiton.org/repositories/revision/nuiton-web/107 Log: Anomalie #1662: Can not use mycheckboxlist with nested id Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-08-05 02:12:33 UTC (rev 106) +++ trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-08-12 15:42:16 UTC (rev 107) @@ -1,10 +1,3 @@ -<script type="text/javascript"> - - function checkall(ids, value) { - $('input[name="'+ids+'"]').attr('checked', value); - } - -</script> <#assign itemCount = 0/> <#if parameters.list??> <@s.iterator value="parameters.list"> @@ -37,9 +30,9 @@ <br/> </(a)s.iterator> <#if !parameters.disabled?default(false) && (itemCount > 0)> -<a href="javascript:void(checkall('${parameters.name?html}', true))"><@s.text name="nuiton-struts2.selectAll"/></a> +<a href="javascript:$('#wwctrl_${parameters.id} input').attr('checked', true)"><@s.text name="nuiton-struts2.selectAll"/></a>   -<a href="javascript:void(checkall('${parameters.name?html}', false))"><@s.text name="nuiton-struts2.unselectAll"/></a> +<a href="javascript:$('#wwctrl_${parameters.id} input').attr('checked', false)"><@s.text name="nuiton-struts2.unselectAll"/></a> <br/> </#if> <#else>

1 0

r106 - trunk/nuiton-struts2/src/main/resources/template/simple
by tchemit＠users.nuiton.org 05 Aug '11

05 Aug '11

Author: tchemit Date: 2011-08-05 04:12:33 +0200 (Fri, 05 Aug 2011) New Revision: 106 Url: http://nuiton.org/repositories/revision/nuiton-web/106 Log: Anomalie #1662: Can not use mycheckboxlist with nested id Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-08-04 15:56:00 UTC (rev 105) +++ trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-08-05 02:12:33 UTC (rev 106) @@ -1,3 +1,10 @@ +<script type="text/javascript"> + + function checkall(ids, value) { + $('input[name="'+ids+'"]').attr('checked', value); + } + +</script> <#assign itemCount = 0/> <#if parameters.list??> <@s.iterator value="parameters.list"> @@ -30,9 +37,9 @@ <br/> </(a)s.iterator> <#if !parameters.disabled?default(false) && (itemCount > 0)> -<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', true))"><@s.text name="nuiton-struts2.selectAll"/></a> +<a href="javascript:void(checkall('${parameters.name?html}', true))"><@s.text name="nuiton-struts2.selectAll"/></a>   -<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', false))"><@s.text name="nuiton-struts2.unselectAll"/></a> +<a href="javascript:void(checkall('${parameters.name?html}', false))"><@s.text name="nuiton-struts2.unselectAll"/></a> <br/> </#if> <#else>

1 0

r105 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by hudson＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: hudson Date: 2011-08-04 17:56:00 +0200 (Thu, 04 Aug 2011) New Revision: 105 Url: http://nuiton.org/repositories/revision/nuiton-web/105 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 2011-08-04 15:55:59 UTC (rev 104) +++ trunk/nuiton-gwt/pom.xml 2011-08-04 15:56:00 UTC (rev 105) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-08-04 15:55:59 UTC (rev 104) +++ trunk/nuiton-rss/pom.xml 2011-08-04 15:56:00 UTC (rev 105) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-08-04 15:55:59 UTC (rev 104) +++ trunk/nuiton-struts2/pom.xml 2011-08-04 15:56:00 UTC (rev 105) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-08-04 15:55:59 UTC (rev 104) +++ trunk/nuiton-tapestry/pom.xml 2011-08-04 15:56:00 UTC (rev 105) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-08-04 15:55:59 UTC (rev 104) +++ trunk/nuiton-web/pom.xml 2011-08-04 15:56:00 UTC (rev 105) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 15:55:59 UTC (rev 104) +++ trunk/pom.xml 2011-08-04 15:56:00 UTC (rev 105) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -302,11 +302,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.3</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.3 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.3</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> </project>

1 0

r104 - tags
by hudson＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: hudson Date: 2011-08-04 17:55:59 +0200 (Thu, 04 Aug 2011) New Revision: 104 Url: http://nuiton.org/repositories/revision/nuiton-web/104 Log: [maven-release-plugin] copy for tag nuiton-web-1.3 Added: tags/nuiton-web-1.3/

1 0

r103 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by hudson＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: hudson Date: 2011-08-04 17:55:57 +0200 (Thu, 04 Aug 2011) New Revision: 103 Url: http://nuiton.org/repositories/revision/nuiton-web/103 Log: [maven-release-plugin] prepare release nuiton-web-1.3 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 2011-08-04 15:44:36 UTC (rev 102) +++ trunk/nuiton-gwt/pom.xml 2011-08-04 15:55:57 UTC (rev 103) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-08-04 15:44:36 UTC (rev 102) +++ trunk/nuiton-rss/pom.xml 2011-08-04 15:55:57 UTC (rev 103) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-08-04 15:44:36 UTC (rev 102) +++ trunk/nuiton-struts2/pom.xml 2011-08-04 15:55:57 UTC (rev 103) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-08-04 15:44:36 UTC (rev 102) +++ trunk/nuiton-tapestry/pom.xml 2011-08-04 15:55:57 UTC (rev 103) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-08-04 15:44:36 UTC (rev 102) +++ trunk/nuiton-web/pom.xml 2011-08-04 15:55:57 UTC (rev 103) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 15:44:36 UTC (rev 102) +++ trunk/pom.xml 2011-08-04 15:55:57 UTC (rev 103) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <modules> <module>nuiton-web</module> @@ -302,11 +302,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.3</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.3 </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.3</url> </scm> </project>

1 0

r102 - trunk
by tchemit＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: tchemit Date: 2011-08-04 17:44:36 +0200 (Thu, 04 Aug 2011) New Revision: 102 Url: http://nuiton.org/repositories/revision/nuiton-web/102 Log: Evolution #1627: Updates to ToPIA 2.6.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 15:29:47 UTC (rev 101) +++ trunk/pom.xml 2011-08-04 15:44:36 UTC (rev 102) @@ -225,7 +225,7 @@ <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> <jredminePluginVersion>1.2</jredminePluginVersion> - <topiaVersion>2.6.1-SNAPSHOT</topiaVersion> + <topiaVersion>2.6.1</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r101 - trunk
by tchemit＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: tchemit Date: 2011-08-04 17:29:47 +0200 (Thu, 04 Aug 2011) New Revision: 101 Url: http://nuiton.org/repositories/revision/nuiton-web/101 Log: Evolution #1657: Updates to i18n 2.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 09:51:39 UTC (rev 100) +++ trunk/pom.xml 2011-08-04 15:29:47 UTC (rev 101) @@ -221,7 +221,7 @@  <projectId>nuiton-web</projectId> - <nuitonI18nVersion>2.4.1-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> <jredminePluginVersion>1.2</jredminePluginVersion>

1 0

r100 - trunk
by tchemit＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: tchemit Date: 2011-08-04 11:51:39 +0200 (Thu, 04 Aug 2011) New Revision: 100 Url: http://nuiton.org/repositories/revision/nuiton-web/100 Log: Update mavenpom4redmineAndCentral to 3.0. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 07:51:42 UTC (rev 99) +++ trunk/pom.xml 2011-08-04 09:51:39 UTC (rev 100) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.5</version> + <version>3.0</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r99 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2
by tchemit＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: tchemit Date: 2011-08-04 09:51:42 +0200 (Thu, 04 Aug 2011) New Revision: 99 Url: http://nuiton.org/repositories/revision/nuiton-web/99 Log: add little javadoc to use text provider Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2011-08-03 08:27:27 UTC (rev 98) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2011-08-04 07:51:42 UTC (rev 99) @@ -37,8 +37,14 @@ import java.util.ResourceBundle; /** - * Struts2's TextProvider implementation using nuiton's i18n + * Struts2's TextProvider implementation using nuiton's i18n. * + * To use this text provider add the two following lines in your strust.xml : + * <pre> + * <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider" /> + <constant name="struts.xworkTextProvider" value="i18nTextProvider" /> + * </pre> + * * @author Arnaud Thimel<thimel(a)codelutin.com> * @since 1.3 */

1 0

r98 - in trunk: . nuiton-struts2 nuiton-struts2/src nuiton-struts2/src/main/java/org/nuiton/web/struts2 nuiton-struts2/src/test nuiton-struts2/src/test/java nuiton-struts2/src/test/java/org nuiton-struts2/src/test/java/org/nuiton nuiton-struts2/src/test/java/org/nuiton/web nuiton-struts2/src/test/java/org/nuiton/web/struts2 nuiton-struts2/src/test/resources nuiton-struts2/src/test/resources/META-INF
by athimel＠users.nuiton.org 03 Aug '11

03 Aug '11

Author: athimel Date: 2011-08-03 10:27:27 +0200 (Wed, 03 Aug 2011) New Revision: 98 Url: http://nuiton.org/repositories/revision/nuiton-web/98 Log: #1651 : Create a TextProvider for Struts2 using nuiton's i18n Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java trunk/nuiton-struts2/src/test/ trunk/nuiton-struts2/src/test/java/ trunk/nuiton-struts2/src/test/java/org/ trunk/nuiton-struts2/src/test/java/org/nuiton/ trunk/nuiton-struts2/src/test/java/org/nuiton/web/ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java trunk/nuiton-struts2/src/test/resources/ trunk/nuiton-struts2/src/test/resources/META-INF/ trunk/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties trunk/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties Modified: trunk/nuiton-struts2/pom.xml trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java trunk/pom.xml Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-07-30 01:28:16 UTC (rev 97) +++ trunk/nuiton-struts2/pom.xml 2011-08-03 08:27:27 UTC (rev 98) @@ -31,6 +31,11 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-07-30 01:28:16 UTC (rev 97) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-08-03 08:27:27 UTC (rev 98) @@ -25,13 +25,8 @@ package org.nuiton.web.struts2; import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.util.ValueStack; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.util.Arrays; -import java.util.List; /** * Base action to use for a better usage of I18n. @@ -43,10 +38,6 @@ private static final long serialVersionUID = 1L; - public static final String UNTRANSLATED_MARKER = "???"; - - private static final Log log = LogFactory.getLog(BaseAction.class); - public String _(String aTextName) { String value = getText(aTextName); return value; @@ -57,80 +48,4 @@ return value; } - @Override - public String getText(String aTextName) { - String value = super.getText(aTextName); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String aTextName, String defaultValue) { - String value = super.getText(aTextName, defaultValue); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String aTextName, - String defaultValue, - String obj) { - String value = super.getText(aTextName, defaultValue, obj); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String aTextName, List<?> args) { - String value = super.getText(aTextName, args); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String key, String[] args) { - String value = super.getText(key, args); - return getSafeText(key, value); - } - - @Override - public String getText(String aTextName, - String defaultValue, - List<?> args) { - String value = super.getText(aTextName, defaultValue, args); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String key, - String defaultValue, - String[] args) { - String value = super.getText(key, defaultValue, args); - return getSafeText(key, value); - } - - @Override - public String getText(String key, - String defaultValue, - List<?> args, - ValueStack stack) { - String value = super.getText(key, defaultValue, args, stack); - return getSafeText(key, value); - } - - @Override - public String getText(String key, - String defaultValue, - String[] args, - ValueStack stack) { - String value = super.getText(key, defaultValue, args, stack); - return getSafeText(key, value); - } - - protected String getSafeText(String key, String value) { - if (StringUtils.isEmpty(value)) { - if (log.isWarnEnabled()) { - log.warn("Key [" + key + "] is not translated"); - } - return UNTRANSLATED_MARKER + key + UNTRANSLATED_MARKER; - } - return value; - } - } Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2011-08-03 08:27:27 UTC (rev 98) @@ -0,0 +1,183 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ +package org.nuiton.web.struts2; + +import com.opensymphony.xwork2.LocaleProvider; +import com.opensymphony.xwork2.ResourceBundleTextProvider; +import com.opensymphony.xwork2.util.ValueStack; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; + +import java.util.List; +import java.util.Locale; +import java.util.ResourceBundle; + +/** + * Struts2's TextProvider implementation using nuiton's i18n + * + * @author Arnaud Thimel<thimel(a)codelutin.com> + * @since 1.3 + */ +public class I18nTextProvider implements ResourceBundleTextProvider { + + private static final Log log = LogFactory.getLog(BaseAction.class); + + public static final String UNTRANSLATED_MARKER = "???"; + + protected LocaleProvider localeProvider; + + protected String getSafeText(String key, String value) { + if (StringUtils.isEmpty(value)) { + if (log.isWarnEnabled()) { + log.warn("Key [" + key + "] is not translated"); + } + return UNTRANSLATED_MARKER + key + UNTRANSLATED_MARKER; + } + return value; + } + + @Override + public void setBundle(ResourceBundle bundle) { + // Nothing to do + } + + @Override + public void setClazz(Class clazz) { + // Nothing to do + } + + @Override + public void setLocaleProvider(LocaleProvider localeProvider) { + this.localeProvider = localeProvider; + } + + @Override + public boolean hasKey(String key) { + Locale locale = localeProvider.getLocale(); + boolean result = I18n.hasKey(locale, key); + return result; + } + + protected String getTextFromLocale(String key, String defaultValue) { + Locale locale = localeProvider.getLocale(); + String result = I18n.l_(locale, key); + if (result == null) { + result = defaultValue; + } + result = getSafeText(key, result); + return result; + } + + protected String getTextFromLocale(String key, String defaultValue, Object ... args) { + Locale locale = localeProvider.getLocale(); + String result = I18n.l_(locale, key, args); + if (result == null) { + result = defaultValue; + } + result = getSafeText(key, result); + return result; + } + + @Override + public String getText(String aTextName) { + String value = getTextFromLocale(aTextName, null); + return value; + } + + @Override + public String getText(String aTextName, String defaultValue) { + String value = getTextFromLocale(aTextName, defaultValue); + return value; + } + + @Override + public String getText(String aTextName, + String defaultValue, + String obj) { + String value = getTextFromLocale(aTextName, defaultValue, obj); + return value; + } + + @Override + public String getText(String aTextName, List<?> args) { + Object[] array = args.toArray(); + String value = getTextFromLocale(aTextName, null, array); + return value; + } + + @Override + public String getText(String key, String[] args) { + String value = getTextFromLocale(key, null, args); + return value; + } + + @Override + public String getText(String aTextName, + String defaultValue, + List<?> args) { + Object[] array = args.toArray(); + String value = getTextFromLocale(aTextName, defaultValue, array); + return value; + } + + @Override + public String getText(String key, + String defaultValue, + String[] args) { + String value = getTextFromLocale(key, defaultValue, args); + return value; + } + + @Override + public String getText(String key, + String defaultValue, + List<?> args, + ValueStack stack) { + String value = getText(key, defaultValue, args); + return value; + } + + @Override + public String getText(String key, + String defaultValue, + String[] args, + ValueStack stack) { + String value = getText(key, defaultValue, args); + return value; + } + + @Override + public ResourceBundle getTexts(String bundleName) { + return null; + } + + @Override + public ResourceBundle getTexts() { + return null; + } + +} Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java (rev 0) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java 2011-08-03 08:27:27 UTC (rev 98) @@ -0,0 +1,95 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ +package org.nuiton.web.struts2; + +import com.opensymphony.xwork2.LocaleProvider; +import junit.framework.Assert; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; + +import java.util.Arrays; +import java.util.Locale; + +public class I18nTextProviderTest { + + protected I18nTextProvider provider; + @After + public void after() throws Exception { + I18n.close(); + } + + @Before + public void init() throws Exception { + + DefaultI18nInitializer initializer = new DefaultI18nInitializer("toto"); + initializer.setMissingKeyReturnNull(true); + I18n.init(initializer, Locale.FRENCH); + + provider = new I18nTextProvider(); + provider.setLocaleProvider(new LocaleProvider() { + @Override + public Locale getLocale() { + return Locale.FRENCH; + } + }); + + } + + @Test + public void testHasKey() throws Exception { + Assert.assertFalse(provider.hasKey("missing")); + Assert.assertTrue(provider.hasKey("present")); + } + + @Test + public void testGetTextSimple() throws Exception { + Assert.assertEquals("yes", provider.getText("present")); + Assert.assertEquals(I18nTextProvider.UNTRANSLATED_MARKER + "missing" + I18nTextProvider.UNTRANSLATED_MARKER, provider.getText("missing")); + } + + @Test + public void testGetTextDefaultValue() throws Exception { + Assert.assertEquals("yes", provider.getText("present", "toto")); + Assert.assertEquals("toto", provider.getText("missing", "toto")); + } + + @Test + public void testGetTextArg() throws Exception { + Assert.assertEquals("Hello Arno !", provider.getText("hello", null, "Arno")); + } + + @Test + public void testGetTextArgs() throws Exception { + Assert.assertEquals("Hello Arno, ça biche ?", provider.getText("hello_plus", new String[] {"Arno", "ça biche"})); + Assert.assertEquals("Hello Moto, ça gaze ?", provider.getText("hello_plus", Arrays.asList("Moto", "ça gaze"))); + + Assert.assertEquals("Bonjour", provider.getText("hello_moins", "Bonjour", new String[] {"Arno", "ça biche"})); + Assert.assertEquals("Bonjour", provider.getText("hello_moins", "Bonjour", Arrays.asList("Moto", "ça gaze"))); + } + +} Property changes on: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties =================================================================== --- trunk/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties (rev 0) +++ trunk/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties 2011-08-03 08:27:27 UTC (rev 98) @@ -0,0 +1,28 @@ +### +# #%L +# Nuiton Web :: Nuiton Struts 2 +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 CodeLutin +# %% +# 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% +### + +bundles.fr_FR=bundleTest/toto_fr_FR.properties +encoding=utf-8 +locales=fr_FR Property changes on: trunk/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties =================================================================== --- trunk/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties (rev 0) +++ trunk/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties 2011-08-03 08:27:27 UTC (rev 98) @@ -0,0 +1,27 @@ +### +# #%L +# Nuiton Web :: Nuiton Struts 2 +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 CodeLutin +# %% +# 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% +### +present=yes +hello=Hello %s ! +hello_plus=Hello %s, %s ? \ No newline at end of file Property changes on: trunk/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-30 01:28:16 UTC (rev 97) +++ trunk/pom.xml 2011-08-03 08:27:27 UTC (rev 98) @@ -110,6 +110,14 @@  <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>provided</scope> + </dependency> + +  + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>${topiaVersion}</version> @@ -213,7 +221,9 @@  <projectId>nuiton-web</projectId> - <nuitonI18nPluginVersion>2.4</nuitonI18nPluginVersion> + <nuitonI18nVersion>2.4.1-SNAPSHOT</nuitonI18nVersion> + + <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> <jredminePluginVersion>1.2</jredminePluginVersion> <topiaVersion>2.6.1-SNAPSHOT</topiaVersion>

1 0

r97 - trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table
by jcouteau＠users.nuiton.org 30 Jul '11

30 Jul '11

Author: jcouteau Date: 2011-07-30 03:28:16 +0200 (Sat, 30 Jul 2011) New Revision: 97 Url: http://nuiton.org/repositories/revision/nuiton-web/97 Log: #1642 : SortableFlexTable does not update correctly Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-07-22 13:41:22 UTC (rev 96) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-07-30 01:28:16 UTC (rev 97) @@ -34,6 +34,9 @@ implements TableModelListener, ClickHandler { SortableTableModel model; + + //number of rows for update + int rows = 0; public SortableFlexTableWithModel() { super(); @@ -53,7 +56,7 @@ this.model.removeTableModelListener(this); } this.model = model; - this.model.addTableModelListener(this); + getModel().addTableModelListener(this); } public SortableTableModel getModel() { @@ -66,8 +69,9 @@ int firstColumn = event.getColumn(); int lastColumn = event.getColumn(); int type = event.getType(); - - + + int oldRows = rows; + if (firstColumn == TableModelEvent.ALL_COLUMNS) { firstColumn = 0; lastColumn = getColumnCount() - 1; @@ -96,17 +100,29 @@ if (firstRow == lastRow) { Object value = model.getValueAt(i, firstRow); setValueAt(value, firstRow, i); + rows = 1; } else { - for (int j = firstRow; j <= lastRow; j++) { + for (int j = firstRow; j < lastRow; j++) { if (j < model.getRowCount()) { Object value = model.getValueAt(i, j); setValueAt(value, j, i); + rows = j+1; } else { break; } } } + + } + + for (int i = rows; i < oldRows; i++) { + //remove all rows that are not in model anymore + if ((rows+1) < getRowCount()){ + removeRow(rows+1); + } + } + } }

1 0

r96 - trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table
by jcouteau＠users.nuiton.org 22 Jul '11

22 Jul '11

Author: jcouteau Date: 2011-07-22 15:41:22 +0200 (Fri, 22 Jul 2011) New Revision: 96 Url: http://nuiton.org/repositories/revision/nuiton-web/96 Log: #1638 : ArrayOutOfBoundException if the model is empty Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java 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 2011-07-19 17:07:51 UTC (rev 95) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java 2011-07-22 13:41:22 UTC (rev 96) @@ -81,8 +81,12 @@ @Override public Object getValueAt(int col, int row) { - - int modelRow = rowsOrder[row]; + + int modelRow = 0; + + if (rowsOrder.length > 0) { + modelRow = rowsOrder[row]; + } return model.getValueAt(col, modelRow); } @@ -154,6 +158,9 @@ } protected void initRowsOrder() { + + System.out.println("init rows order"); + int rowCount = model.getRowCount(); rowsOrder = new int[rowCount]; for (int i = 0;i<rowCount;i++) {

1 0

r95 - in trunk/nuiton-struts2/src/main/resources: . i18n template/simple
by tchemit＠users.nuiton.org 19 Jul '11

19 Jul '11

Author: tchemit Date: 2011-07-19 19:07:51 +0200 (Tue, 19 Jul 2011) New Revision: 95 Url: http://nuiton.org/repositories/revision/nuiton-web/95 Log: Evolution #1635: use i18n in template mycheckboxlist Added: trunk/nuiton-struts2/src/main/resources/i18n/ trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_en_GB.properties trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_fr_FR.properties Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl Added: trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_en_GB.properties =================================================================== --- trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_en_GB.properties (rev 0) +++ trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_en_GB.properties 2011-07-19 17:07:51 UTC (rev 95) @@ -0,0 +1,2 @@ +nuiton-struts2.selectAll=Select all +nuiton-struts2.unselectAll=Unselect all \ No newline at end of file Property changes on: trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_fr_FR.properties =================================================================== --- trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_fr_FR.properties (rev 0) +++ trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_fr_FR.properties 2011-07-19 17:07:51 UTC (rev 95) @@ -0,0 +1,2 @@ +nuiton-struts2.selectAll=Tout sélectionner +nuiton-struts2.unselectAll=Tout désélectionner \ No newline at end of file Property changes on: trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-07-19 14:35:15 UTC (rev 94) +++ trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-07-19 17:07:51 UTC (rev 95) @@ -30,9 +30,9 @@ <br/> </(a)s.iterator> <#if !parameters.disabled?default(false) && (itemCount > 0)> -<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', true))">Tout sélectionner</a> +<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', true))"><@s.text name="nuiton-struts2.selectAll"/></a>   -<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', false))">Tout désélectionner</a> +<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', false))"><@s.text name="nuiton-struts2.unselectAll"/></a> <br/> </#if> <#else>

1 0

r94 - trunk/nuiton-struts2/src/main/resources/template/simple
by tchemit＠users.nuiton.org 19 Jul '11

19 Jul '11

Author: tchemit Date: 2011-07-19 16:35:15 +0200 (Tue, 19 Jul 2011) New Revision: 94 Url: http://nuiton.org/repositories/revision/nuiton-web/94 Log: Anomalie #1633: mycheckboxlist does not work under firefox Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-07-08 07:19:00 UTC (rev 93) +++ trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-07-19 14:35:15 UTC (rev 94) @@ -30,9 +30,9 @@ <br/> </(a)s.iterator> <#if !parameters.disabled?default(false) && (itemCount > 0)> -<a href="javascript:$('input[name=${parameters.name?html}]').attr('checked', true);">Tout sélectionner</a> +<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', true))">Tout sélectionner</a>   -<a href="javascript:$('input[name=${parameters.name?html}]').attr('checked', false);">Tout désélectionner</a> +<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', false))">Tout désélectionner</a> <br/> </#if> <#else>

1 0

r93 - in trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2: . interceptor
by tchemit＠users.nuiton.org 08 Jul '11

08 Jul '11

Author: tchemit Date: 2011-07-08 09:19:00 +0200 (Fri, 08 Jul 2011) New Revision: 93 Url: http://nuiton.org/repositories/revision/nuiton-web/93 Log: Evolution #1624: Remove TopiaTransactionAware Evolution #1628: Improve the TopiaTransactionInterceptor Removed: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Deleted: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-07 18:02:25 UTC (rev 92) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-08 07:19:00 UTC (rev 93) @@ -1,45 +0,0 @@ -/* - * #%L - * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit - * %% - * 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% - */ -package org.nuiton.web.struts2; - -import org.nuiton.topia.TopiaContext; - -/** - * Use this contract on a object which use a {@code TopiaContext} as a - * transaction. - * <p/> - * The method {@link #getTransaction()} returns the internal transaction used. - * <p/> - * the method {@link #setTransaction(TopiaContext)} put the internal - * transaction. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.2 - * @deprecated since 1.4, prefer use the same class in topia project., will be remove soon - */ -@Deprecated -public interface TopiaTransactionAware extends org.nuiton.topia.framework.TopiaTransactionAware { - -} Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-07 18:02:25 UTC (rev 92) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-08 07:19:00 UTC (rev 93) @@ -32,8 +32,12 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.web.struts2.TopiaTransactionAware; +import org.nuiton.topia.framework.TopiaTransactionAware; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -45,25 +49,28 @@ /** *  * <p/> - * The aim of this Interceptor is to inject a freshly opened {@code transaction} - * in a action which implements {@link TopiaTransactionAware} contract and - * after result of action, to close the transaction. + * The aim of this Interceptor is to manage a {@code transaction} all along + * a action which implements {@link TopiaTransactionAware} + * contract. * <p/> + * Technicaly, the action will receive only a proxy of a transaction and a real + * transaction will only be created as soon as a method will be asked on it. + * <p/> * The interceptor is abstract and let user to implement the way how to open a * new transaction via the method {@link #beginTransaction()}. * <p/> - * Note that the transaction pushed in the action is in fact a proxy of the - * freshly opened transaction to forbid some method to be call on it. The list - * of method to forbid can be customized using the interceptor parameter - * {@link #excludeMethods}. + * Note that the transaction pushed in the action can be limited using a list + * of methods to exclude on it. The list of methods to forbid can be customized + * using the interceptor parameter {@link #excludeMethods}. * <p/> - * Note also that the transaction is closed after all stack of interceptor - * consumed, this means that the transaction will still be opened while - * rendering the result, this is a particular interesting thing to avoid + * Note also that the transaction is commited and closed after all stack of + * interceptor consumed, this means that the transaction will still be opened + * while rendering the result, this is a particular interesting thing to avoid * pre-loading of entities due to lazy strategy of hibernate for example. * With this mecanism you can feel free to just obtain the obtain from database * via a DAO and then really load it in the rendering result. * <p/> + * If you do not want any commit for a given action, just put on the class a commit * <p/> * This interceptor, as it provides connection to database should be in the * interceptor stack before any other interceptor requiring access to database. @@ -89,6 +96,12 @@ */ public abstract class TopiaTransactionInterceptor extends AbstractInterceptor { + /** To specify on your action that you never want any commit. */ + @Retention(RetentionPolicy.RUNTIME) + @Target({ElementType.TYPE, ElementType.METHOD}) + public @interface NoCommit { + } + /** Logger. */ private static final Log log = LogFactory.getLog(TopiaTransactionInterceptor.class); @@ -109,7 +122,8 @@ } public void setExcludeMethods(String excludeMethods) { - this.excludeMethods = TextParseUtil.commaDelimitedStringToSet(excludeMethods); + this.excludeMethods = + TextParseUtil.commaDelimitedStringToSet(excludeMethods); } /** @@ -136,59 +150,109 @@ @Override public String intercept(ActionInvocation invocation) throws Exception { - org.nuiton.topia.framework.TopiaTransactionAware transactionAware = null; + TopiaTransactionAware transactionAware = null; Object action = invocation.getProxy().getAction(); - if (action instanceof org.nuiton.topia.framework.TopiaTransactionAware) { - transactionAware = (org.nuiton.topia.framework.TopiaTransactionAware) action; + if (action instanceof TopiaTransactionAware) { + transactionAware = (TopiaTransactionAware) action; } if (transactionAware == null) { - // not a transaction aware action + // not a transaction aware action, direct skip this interceptor return invocation.invoke(); } - // action need a transaction - TopiaContext transaction = beginTransaction(); + // creates a proxy of a lazy transaction - if (log.isDebugEnabled()) { - log.debug("Open transaction " + transaction); - } + TopiaTransactionProxyInvocationHandler proxyInvocationHandler = + new TopiaTransactionProxyInvocationHandler(); - // creates a proxy on the transaction to push back in action TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( getClass().getClassLoader(), new Class<?>[]{TopiaContext.class, TopiaContextImplementor.class}, - new TopiaTransactionProxyInvocationHandler(transaction) + proxyInvocationHandler ); // set the transaction in the action transactionAware.setTransaction(proxy); - boolean doCommit = true; + boolean doCommit = isCommitNeeded(action, invocation); try { return invocation.invoke(); } catch (Exception e) { doCommit = false; - transaction.rollbackTransaction(); + TopiaContext transaction = proxyInvocationHandler.getTransaction(); + if (transaction != null && !transaction.isClosed()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction " + transaction); + } + transaction.rollbackTransaction(); + } + throw e; } finally { - if (doCommit) { - transaction.commitTransaction(); + TopiaContext transaction = proxyInvocationHandler.getTransaction(); + + if (transaction != null && !transaction.isClosed()) { + try { + if (doCommit) { + + // commit the opened transaction + if (log.isDebugEnabled()) { + log.debug("Commit transaction " + transaction); + } + transaction.commitTransaction(); + } + } finally { + + // close the opened transaction + if (log.isDebugEnabled()) { + log.debug("Close transaction " + transaction); + } + transaction.closeContext(); + } + } + } + } + + protected boolean isCommitNeeded(Object action, + ActionInvocation invocation) throws NoSuchMethodException { + Class<?> actionType = action.getClass(); + boolean noCommit = actionType.isAnnotationPresent(NoCommit.class); + if (noCommit) { + + // a no commit annotation was found on the top of action if (log.isDebugEnabled()) { - log.debug("Close transaction " + transaction); + log.debug("NoCommit annotation found on action " + + actionType.getName()); } - // close the opened transaction - transaction.closeContext(); + return false; } + + // try to look on the methodName + String methodName = invocation.getProxy().getMethod(); + if (methodName == null) { + + // no methodName specify, means the execute one + methodName = "execute"; + } + Method method = actionType.getMethod(methodName); + noCommit = method.isAnnotationPresent(NoCommit.class); + if (noCommit) { + if (log.isDebugEnabled()) { + log.debug("NoCommit annotation found on action methodName " + + actionType.getName() + "#" + methodName); + } + } + return !noCommit; } /** @@ -196,13 +260,13 @@ * * @see TopiaTransactionInterceptor#excludeMethods */ - class TopiaTransactionProxyInvocationHandler implements InvocationHandler { + public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { /** Target to use for the proxy. */ - protected final TopiaContext tx; + protected TopiaContext transaction; - TopiaTransactionProxyInvocationHandler(TopiaContext tx) { - this.tx = tx; + public TopiaContext getTransaction() { + return transaction; } @Override @@ -220,9 +284,18 @@ proxy); } - // can invoke the method on the tx + if (transaction == null) { + + // first time transaction is required, create its + transaction = beginTransaction(); + + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); + } + } + // can invoke the method on the transaction try { - Object result = method.invoke(tx, args); + Object result = method.invoke(transaction, args); return result; } catch (Exception eee) { if (log.isErrorEnabled()) {

1 0

r92 - in trunk: . nuiton-struts2/src/main/java/org/nuiton/web/struts2 nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 07 Jul '11

07 Jul '11

Author: tchemit Date: 2011-07-07 20:02:25 +0200 (Thu, 07 Jul 2011) New Revision: 92 Url: http://nuiton.org/repositories/revision/nuiton-web/92 Log: Evolution #1627: Updates to ToPIA 2.6.1 Evolution #1624: Remove TopiaTransactionAware Evolution #1628: Improve the TopiaTransactionInterceptor Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java trunk/pom.xml Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-05 13:19:59 UTC (rev 91) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-07 18:02:25 UTC (rev 92) @@ -37,22 +37,9 @@ * * @author tchemit <chemit(a)codelutin.com> * @since 1.2 + * @deprecated since 1.4, prefer use the same class in topia project., will be remove soon */ -public interface TopiaTransactionAware { +@Deprecated +public interface TopiaTransactionAware extends org.nuiton.topia.framework.TopiaTransactionAware { - /** - * Obtains the internal transaction. - * <p/> - * If no transaction was opened, can return the {@code null} object. - * - * @return the current transaction (can be null or closed...). - */ - TopiaContext getTransaction(); - - /** - * Put in the instance, the given transaction. - * - * @param transaction the transaction to push - */ - void setTransaction(TopiaContext transaction); } Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-05 13:19:59 UTC (rev 91) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-07 18:02:25 UTC (rev 92) @@ -136,51 +136,58 @@ @Override public String intercept(ActionInvocation invocation) throws Exception { - TopiaTransactionAware transactionAware = null; + org.nuiton.topia.framework.TopiaTransactionAware transactionAware = null; Object action = invocation.getProxy().getAction(); - if (action instanceof TopiaTransactionAware) { - transactionAware = (TopiaTransactionAware) action; + if (action instanceof org.nuiton.topia.framework.TopiaTransactionAware) { + transactionAware = (org.nuiton.topia.framework.TopiaTransactionAware) action; } - TopiaContext transaction = null; - if (transactionAware != null) { + if (transactionAware == null) { - // action need a transaction - transaction = beginTransaction(); + // not a transaction aware action + return invocation.invoke(); + } - if (log.isDebugEnabled()) { - log.debug("Open transaction " + transaction); - } - // creates a proxy on the transaction to push back in action - TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( - getClass().getClassLoader(), - new Class<?>[]{TopiaContext.class, - TopiaContextImplementor.class}, - new TopiaTransactionProxyInvocationHandler(transaction) - ); + // action need a transaction + TopiaContext transaction = beginTransaction(); - // set the transaction in the action - transactionAware.setTransaction(proxy); + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); } + + // creates a proxy on the transaction to push back in action + TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{TopiaContext.class, + TopiaContextImplementor.class}, + new TopiaTransactionProxyInvocationHandler(transaction) + ); + + // set the transaction in the action + transactionAware.setTransaction(proxy); + + boolean doCommit = true; try { return invocation.invoke(); - } finally { + } catch (Exception e) { - if (transactionAware != null) { + doCommit = false; + transaction.rollbackTransaction(); - // we are on a action with a internal topia transaction + throw e; + } finally { - if (transaction != null && !transaction.isClosed()) { + if (doCommit) { + transaction.commitTransaction(); + } - if (log.isDebugEnabled()) { - log.debug("Close transaction " + transaction); - } - // close the opened transaction - transaction.closeContext(); - } + if (log.isDebugEnabled()) { + log.debug("Close transaction " + transaction); } + // close the opened transaction + transaction.closeContext(); } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-05 13:19:59 UTC (rev 91) +++ trunk/pom.xml 2011-07-07 18:02:25 UTC (rev 92) @@ -215,7 +215,7 @@ <nuitonI18nPluginVersion>2.4</nuitonI18nPluginVersion> <jredminePluginVersion>1.2</jredminePluginVersion> - <topiaVersion>2.6</topiaVersion> + <topiaVersion>2.6.1-SNAPSHOT</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r90 - tags
by hudson＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: hudson Date: 2011-07-05 15:19:58 +0200 (Tue, 05 Jul 2011) New Revision: 90 Url: http://nuiton.org/repositories/revision/nuiton-web/90 Log: [maven-release-plugin] copy for tag nuiton-web-1.2 Added: tags/nuiton-web-1.2/

1 0

r91 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by hudson＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: hudson Date: 2011-07-05 15:19:59 +0200 (Tue, 05 Jul 2011) New Revision: 91 Url: http://nuiton.org/repositories/revision/nuiton-web/91 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 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/nuiton-gwt/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/nuiton-rss/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/nuiton-struts2/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/nuiton-tapestry/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/nuiton-web/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -292,11 +292,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.2</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.2 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.2</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> </project>

1 0

r89 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by hudson＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: hudson Date: 2011-07-05 15:19:57 +0200 (Tue, 05 Jul 2011) New Revision: 89 Url: http://nuiton.org/repositories/revision/nuiton-web/89 Log: [maven-release-plugin] prepare release nuiton-web-1.2 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 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/nuiton-gwt/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/nuiton-rss/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/nuiton-struts2/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/nuiton-tapestry/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/nuiton-web/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <modules> <module>nuiton-web</module> @@ -292,11 +292,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.2</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.2 </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.2</url> </scm> </project>

1 0

r88 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2
by tchemit＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: tchemit Date: 2011-07-05 14:11:36 +0200 (Tue, 05 Jul 2011) New Revision: 88 Url: http://nuiton.org/repositories/revision/nuiton-web/88 Log: javadoc Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-05 12:01:58 UTC (rev 87) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-05 12:11:36 UTC (rev 88) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 CodeLutin + * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -31,9 +31,12 @@ * transaction. * <p/> * The method {@link #getTransaction()} returns the internal transaction used. + * <p/> + * the method {@link #setTransaction(TopiaContext)} put the internal + * transaction. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.1 + * @since 1.2 */ public interface TopiaTransactionAware { @@ -45,6 +48,11 @@ * @return the current transaction (can be null or closed...). */ TopiaContext getTransaction(); - + + /** + * Put in the instance, the given transaction. + * + * @param transaction the transaction to push + */ void setTransaction(TopiaContext transaction); }

1 0

r87 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: tchemit Date: 2011-07-05 14:01:58 +0200 (Tue, 05 Jul 2011) New Revision: 87 Url: http://nuiton.org/repositories/revision/nuiton-web/87 Log: add final javadoc Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-05 10:22:53 UTC (rev 86) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-05 12:01:58 UTC (rev 87) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 CodeLutin + * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -41,8 +41,48 @@ import java.util.HashSet; import java.util.Set; + /** - * To deal with topia transaction . + *  + * <p/> + * The aim of this Interceptor is to inject a freshly opened {@code transaction} + * in a action which implements {@link TopiaTransactionAware} contract and + * after result of action, to close the transaction. + * <p/> + * The interceptor is abstract and let user to implement the way how to open a + * new transaction via the method {@link #beginTransaction()}. + * <p/> + * Note that the transaction pushed in the action is in fact a proxy of the + * freshly opened transaction to forbid some method to be call on it. The list + * of method to forbid can be customized using the interceptor parameter + * {@link #excludeMethods}. + * <p/> + * Note also that the transaction is closed after all stack of interceptor + * consumed, this means that the transaction will still be opened while + * rendering the result, this is a particular interesting thing to avoid + * pre-loading of entities due to lazy strategy of hibernate for example. + * With this mecanism you can feel free to just obtain the obtain from database + * via a DAO and then really load it in the rendering result. + * <p/> + * <p/> + * This interceptor, as it provides connection to database should be in the + * interceptor stack before any other interceptor requiring access to database. + * For example, it is a common behaviour to do such calls in a prepare method, + * so make sure to place this interceptor before the {@code prepare} interceptor. + *  + * <p/> + * <p/> <u>Interceptor parameters:</u> + * <p/> + *  + * <p/> + * <ul> + * <li>excludeMethods (optional) - Customized method names separated by coma to + * forbid on the proxy of the transaction given to action. By default, if this + * parameter is not filled, then we will use this one : + * {@link #DEFAULT_EXCLUDE_METHODS}.</li> + * </ul> + * <p/> + *  * * @author tchemit <chemit(a)codelutin.com> * @since 1.2 @@ -61,6 +101,7 @@ "clear" }; + /** names of methods to forbid access while using proxy. */ protected Set<String> excludeMethods; public Set<String> getExcludeMethods() { @@ -71,6 +112,12 @@ this.excludeMethods = TextParseUtil.commaDelimitedStringToSet(excludeMethods); } + /** + * Method to open a new transaction. + * + * @return the new freshly opened transaction + * @throws TopiaException if any problem while opening a new transaction + */ protected abstract TopiaContext beginTransaction() throws TopiaException; @Override @@ -111,7 +158,7 @@ getClass().getClassLoader(), new Class<?>[]{TopiaContext.class, TopiaContextImplementor.class}, - new TopiaTransactionProxy(transaction) + new TopiaTransactionProxyInvocationHandler(transaction) ); // set the transaction in the action @@ -138,16 +185,16 @@ } /** - * A proxy to used only to forbids usage of some method of the transaction. + * Handler of a proxy on a {@link TopiaContext}. * * @see TopiaTransactionInterceptor#excludeMethods */ - class TopiaTransactionProxy implements InvocationHandler { + class TopiaTransactionProxyInvocationHandler implements InvocationHandler { /** Target to use for the proxy. */ protected final TopiaContext tx; - TopiaTransactionProxy(TopiaContext tx) { + TopiaTransactionProxyInvocationHandler(TopiaContext tx) { this.tx = tx; }

1 0

r86 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: tchemit Date: 2011-07-05 12:22:53 +0200 (Tue, 05 Jul 2011) New Revision: 86 Url: http://nuiton.org/repositories/revision/nuiton-web/86 Log: add logs in interceptor and catch errors in proxy to show errors Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-04 21:36:06 UTC (rev 85) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-05 10:22:53 UTC (rev 86) @@ -27,6 +27,8 @@ import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -47,6 +49,10 @@ */ public abstract class TopiaTransactionInterceptor extends AbstractInterceptor { + /** Logger. */ + private static final Log log = + LogFactory.getLog(TopiaTransactionInterceptor.class); + private static final long serialVersionUID = 1L; public static final String[] DEFAULT_EXCLUDE_METHODS = { @@ -97,6 +103,9 @@ // action need a transaction transaction = beginTransaction(); + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); + } // creates a proxy on the transaction to push back in action TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( getClass().getClassLoader(), @@ -118,6 +127,9 @@ if (transaction != null && !transaction.isClosed()) { + if (log.isDebugEnabled()) { + log.debug("Close transaction " + transaction); + } // close the opened transaction transaction.closeContext(); } @@ -155,9 +167,15 @@ } // can invoke the method on the tx - Object result = method.invoke(tx, args); - - return result; + try { + Object result = method.invoke(tx, args); + return result; + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Could not execute method " + method.getName(), eee); + } + throw eee; + } } }

1 0

r85 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 04 Jul '11

04 Jul '11

Author: tchemit Date: 2011-07-04 23:36:06 +0200 (Mon, 04 Jul 2011) New Revision: 85 Url: http://nuiton.org/repositories/revision/nuiton-web/85 Log: remove the first topia transaction interceptor Removed: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java Deleted: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java 2011-07-04 21:35:36 UTC (rev 84) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java 2011-07-04 21:36:06 UTC (rev 85) @@ -1,76 +0,0 @@ -/* - * #%L - * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 CodeLutin - * %% - * 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% - */ -package org.nuiton.web.struts2.interceptor; - -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import org.nuiton.topia.TopiaContext; -import org.nuiton.web.struts2.TopiaTransactionAware; - -/** - * A interceptor to close the topia transaction in the action (after the result). - * <p/> - * In that way no need to walk inside entities (for lazy problem) and no need - * also to close the opened transaction. - * <p/> - * The action must implements the contract {@link TopiaTransactionAware}. - * - * @author tchemit <chemit(a)codelutin.com> - * @see TopiaTransactionAware - * @since 1.2 - */ -public class CloseTopiaTransactionInterceptor extends AbstractInterceptor { - - private static final long serialVersionUID = 1L; - - @Override - public String intercept(ActionInvocation invocation) throws Exception { - - TopiaTransactionAware transactionAware = null; - - Object action = invocation.getProxy().getAction(); - - if (action instanceof TopiaTransactionAware) { - transactionAware = (TopiaTransactionAware) action; - } - - try { - return invocation.invoke(); - } finally { - if (transactionAware != null) { - - // we are on a action with a internal topia transaction - TopiaContext transaction = transactionAware.getTransaction(); - - if (transaction != null && !transaction.isClosed()) { - - // close the opened transaction - transaction.closeContext(); - } - } - } - - } -}

1 0

r84 - in trunk/nuiton-struts2/src: license main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 04 Jul '11

04 Jul '11

Author: tchemit Date: 2011-07-04 23:35:36 +0200 (Mon, 04 Jul 2011) New Revision: 84 Url: http://nuiton.org/repositories/revision/nuiton-web/84 Log: update file header + svn properties + optimize third parties Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-07-04 21:20:59 UTC (rev 83) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-07-04 21:35:36 UTC (rev 84) @@ -3,15 +3,23 @@ # Already used licenses in project : # - BSD License # - Common Public License Version 1.0 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - http://asm.ow2.org/license.html +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed May 11 10:01:56 CEST 2011 +#Mon Jul 04 23:33:53 CEST 2011 +antlr--antlr--2.7.6--jar=BSD License asm--asm--3.1--jar=http\://asm.ow2.org/license.html asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html -javassist--javassist--3.11.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD License +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 ognl--ognl--3.0.1--jar=The Apache Software License, Version 2.0 Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-04 21:20:59 UTC (rev 83) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-04 21:35:36 UTC (rev 84) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.web.struts2.interceptor; import com.opensymphony.xwork2.ActionInvocation; Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r83 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 04 Jul '11

04 Jul '11

Author: tchemit Date: 2011-07-04 23:20:59 +0200 (Mon, 04 Jul 2011) New Revision: 83 Url: http://nuiton.org/repositories/revision/nuiton-web/83 Log: fix transacvtion proxy Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-04 20:54:39 UTC (rev 82) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-04 21:20:59 UTC (rev 83) @@ -5,6 +5,7 @@ import com.opensymphony.xwork2.util.TextParseUtil; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.web.struts2.TopiaTransactionAware; import java.lang.reflect.InvocationHandler; @@ -72,11 +73,12 @@ // action need a transaction transaction = beginTransaction(); - // creates a proxy + // creates a proxy on the transaction to push back in action TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( getClass().getClassLoader(), - new Class<?>[]{TopiaContext.class}, - new TopiaTransaction() + new Class<?>[]{TopiaContext.class, + TopiaContextImplementor.class}, + new TopiaTransactionProxy(transaction) ); // set the transaction in the action @@ -100,11 +102,19 @@ } /** - * Un proxy pour interdire d'utiliser les méthodes définies dans - * {@link #excludeMethods}. + * A proxy to used only to forbids usage of some method of the transaction. + * + * @see TopiaTransactionInterceptor#excludeMethods */ - class TopiaTransaction implements InvocationHandler { + class TopiaTransactionProxy implements InvocationHandler { + /** Target to use for the proxy. */ + protected final TopiaContext tx; + + TopiaTransactionProxy(TopiaContext tx) { + this.tx = tx; + } + @Override public Object invoke(Object proxy, Method method, @@ -120,8 +130,8 @@ proxy); } - // any other methods are fine - Object result = method.invoke(args); + // can invoke the method on the tx + Object result = method.invoke(tx, args); return result; }

1 0

r82 - in trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2: . interceptor
by tchemit＠users.nuiton.org 04 Jul '11

04 Jul '11

Author: tchemit Date: 2011-07-04 22:54:39 +0200 (Mon, 04 Jul 2011) New Revision: 82 Url: http://nuiton.org/repositories/revision/nuiton-web/82 Log: add new interceptor which deals with opening and closing Topia transaction Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-04 14:47:25 UTC (rev 81) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-04 20:54:39 UTC (rev 82) @@ -45,4 +45,6 @@ * @return the current transaction (can be null or closed...). */ TopiaContext getTransaction(); + + void setTransaction(TopiaContext transaction); } Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-04 20:54:39 UTC (rev 82) @@ -0,0 +1,130 @@ +package org.nuiton.web.struts2.interceptor; + +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.util.TextParseUtil; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.web.struts2.TopiaTransactionAware; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * To deal with topia transaction . + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2 + */ +public abstract class TopiaTransactionInterceptor extends AbstractInterceptor { + + private static final long serialVersionUID = 1L; + + public static final String[] DEFAULT_EXCLUDE_METHODS = { + "beginTransaction", + "closeContext", + "clear" + }; + + protected Set<String> excludeMethods; + + public Set<String> getExcludeMethods() { + return excludeMethods; + } + + public void setExcludeMethods(String excludeMethods) { + this.excludeMethods = TextParseUtil.commaDelimitedStringToSet(excludeMethods); + } + + protected abstract TopiaContext beginTransaction() throws TopiaException; + + @Override + public void init() { + super.init(); + + if (getExcludeMethods() == null) { + + // use default exclude methods + excludeMethods = new HashSet<String>( + Arrays.asList(DEFAULT_EXCLUDE_METHODS) + ); + } + } + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + + TopiaTransactionAware transactionAware = null; + + Object action = invocation.getProxy().getAction(); + + if (action instanceof TopiaTransactionAware) { + transactionAware = (TopiaTransactionAware) action; + } + + TopiaContext transaction = null; + if (transactionAware != null) { + + // action need a transaction + transaction = beginTransaction(); + + // creates a proxy + TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{TopiaContext.class}, + new TopiaTransaction() + ); + + // set the transaction in the action + transactionAware.setTransaction(proxy); + } + try { + return invocation.invoke(); + } finally { + + if (transactionAware != null) { + + // we are on a action with a internal topia transaction + + if (transaction != null && !transaction.isClosed()) { + + // close the opened transaction + transaction.closeContext(); + } + } + } + } + + /** + * Un proxy pour interdire d'utiliser les méthodes définies dans + * {@link #excludeMethods}. + */ + class TopiaTransaction implements InvocationHandler { + + @Override + public Object invoke(Object proxy, + Method method, + Object[] args) throws Throwable { + + String methodName = method.getName(); + + if (getExcludeMethods().contains(methodName)) { + + // not authorized + throw new IllegalAccessException( + "Not allowed to access method " + methodName + " on " + + proxy); + } + + // any other methods are fine + Object result = method.invoke(args); + + return result; + } + } + +} \ No newline at end of file Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r81 - in trunk/nuiton-struts2/src/main/resources: . template template/css_xhtml template/simple
by tchemit＠users.nuiton.org 04 Jul '11

04 Jul '11

Author: tchemit Date: 2011-07-04 16:47:25 +0200 (Mon, 04 Jul 2011) New Revision: 81 Url: http://nuiton.org/repositories/revision/nuiton-web/81 Log: Evolution #1616: Add a customized checkboxlist template Added: trunk/nuiton-struts2/src/main/resources/template/ trunk/nuiton-struts2/src/main/resources/template/css_xhtml/ trunk/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl trunk/nuiton-struts2/src/main/resources/template/simple/ trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl Added: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl (rev 0) +++ trunk/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl 2011-07-04 14:47:25 UTC (rev 81) @@ -0,0 +1,4 @@ +<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" /> + +<#include "/${parameters.templateDir}/simple/mycheckboxlist.ftl" /> + <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/> Property changes on: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl (rev 0) +++ trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-07-04 14:47:25 UTC (rev 81) @@ -0,0 +1,45 @@ +<#assign itemCount = 0/> +<#if parameters.list??> + <@s.iterator value="parameters.list"> + <#assign itemCount = itemCount + 1/> + <#if parameters.listKey??> + <#assign itemKey = stack.findValue(parameters.listKey)/> + <#else> + <#assign itemKey = stack.findValue('top')/> + </#if> + <#if parameters.listValue??> + <#assign itemValue = stack.findString(parameters.listValue)?default("")/> + <#else> + <#assign itemValue = stack.findString('top')/> + </#if> +<#assign itemKeyStr=itemKey.toString() /> +<input type="checkbox" name="${parameters.name?html}" value="${itemKeyStr?html}" id="${parameters.name?html}-${itemCount}"<#rt/> + <#if tag.contains(parameters.nameValue, itemKey)> + checked="checked"<#rt/> + </#if> + <#if parameters.disabled?default(false)> + disabled="disabled"<#rt/> + </#if> + <#if parameters.title??> + title="${parameters.title?html}"<#rt/> + </#if> + <#include "/${parameters.templateDir}/simple/scripting-events.ftl" /> + <#include "/${parameters.templateDir}/simple/common-attributes.ftl" /> +/> +<label for="${parameters.name?html}-${itemCount}" class="checkboxLabel">${itemValue?html}</label> + <br/> + </(a)s.iterator> +<#if !parameters.disabled?default(false) && (itemCount > 0)> +<a href="javascript:$('input[name=${parameters.name?html}]').attr('checked', true);">Tout sélectionner</a> +  +<a href="javascript:$('input[name=${parameters.name?html}]').attr('checked', false);">Tout désélectionner</a> +<br/> +</#if> +<#else> + <#-- --> +</#if> +<input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.name?html}" value=""<#rt/> +<#if parameters.disabled?default(false)> + disabled="disabled"<#rt/> +</#if> + /> \ No newline at end of file Property changes on: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r80 - in trunk: . nuiton-gwt nuiton-gwt/src/main/java/org/nuiton/web/gwt nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc nuiton-gwt/src/main/java/org/nuiton/web/gwt/table nuiton-gwt/src/main/resources/i18n nuiton-rss nuiton-rss/src/license nuiton-rss/src/main/java/org/nuiton/rss nuiton-rss/src/main/resources nuiton-rss/src/main/resources/fckeditor nuiton-rss/src/main/resources/fc
by tchemit＠users.nuiton.org 28 Jun '11

28 Jun '11

Author: tchemit Date: 2011-06-28 14:25:30 +0200 (Tue, 28 Jun 2011) New Revision: 80 Url: http://nuiton.org/repositories/revision/nuiton-web/80 Log: add svn properties + headers Evolution #1607: Introduce a interceptor to close Topia transaction in a struts2 action Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java Modified: trunk/LICENSE.txt trunk/README.txt trunk/changelog.txt trunk/nuiton-gwt/LICENSE.txt trunk/nuiton-gwt/README.txt trunk/nuiton-gwt/changelog.txt trunk/nuiton-gwt/pom.xml trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableButton.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableListBox.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/BlindedPopup.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/LoaderNotification.java 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/FlexTableWithModel.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/SortableFlexTableWithModel.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 trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelListener.java trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties trunk/nuiton-rss/LICENSE.txt trunk/nuiton-rss/README.txt trunk/nuiton-rss/changelog.txt trunk/nuiton-rss/pom.xml trunk/nuiton-rss/src/license/THIRD-PARTY.properties trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js trunk/nuiton-rss/src/main/resources/log4j.properties trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml trunk/nuiton-rss/src/main/webapp/feed.css trunk/nuiton-rss/src/main/webapp/feeds.txt trunk/nuiton-rss/src/main/webapp/index.html trunk/nuiton-rss/src/main/webapp/rssgenerator.js trunk/nuiton-rss/src/main/webapp/rssinclude.js trunk/nuiton-rss/src/main/webapp/testFck.html trunk/nuiton-rss/src/main/webapp/testGenerator.html trunk/nuiton-rss/src/main/webapp/testRender.html trunk/nuiton-rss/src/site/apt/index.apt trunk/nuiton-rss/src/site/site_fr.xml trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java trunk/nuiton-rss/src/test/java/resources/log4j.properties trunk/nuiton-struts2/pom.xml trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java trunk/nuiton-tapestry/LICENSE.txt trunk/nuiton-tapestry/README.txt trunk/nuiton-tapestry/changelog.txt trunk/nuiton-tapestry/pom.xml trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/package-info.java trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/feedback.css trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js trunk/pom.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableButton.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableListBox.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/BlindedPopup.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/LoaderNotification.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/AbstractGWTTableModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/DefaultTableModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/GWTTableModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelEvent.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelListener.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/webapp/feed.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/webapp/feeds.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/webapp/index.html ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/webapp/rssgenerator.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/webapp/rssinclude.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/webapp/testFck.html ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/webapp/testGenerator.html ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/main/webapp/testRender.html ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/site/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-rss/src/test/java/resources/log4j.properties ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-06-07 20:09:14 UTC (rev 79) +++ trunk/nuiton-struts2/pom.xml 2011-06-28 12:25:30 UTC (rev 80) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -15,6 +17,9 @@ <artifactId>nuiton-struts2</artifactId> + <name>Nuiton Web :: Nuiton Struts 2</name> + <description>Extra classes for Struts 2 based applications</description> + <dependencies>  -  -  - - <name>Nuiton Web :: Nuiton Struts 2</name> - <description>Extra classes for Struts 2 based applications</description> - -  -  -  - - <packaging>jar</packaging> - - - <build> - <plugins> - - </plugins> - </build> - </project> Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-06-07 20:09:14 UTC (rev 79) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-06-28 12:25:30 UTC (rev 80) @@ -70,7 +70,9 @@ } @Override - public String getText(String aTextName, String defaultValue, String obj) { + public String getText(String aTextName, + String defaultValue, + String obj) { String value = super.getText(aTextName, defaultValue, obj); return getSafeText(aTextName, value); } @@ -88,25 +90,35 @@ } @Override - public String getText(String aTextName, String defaultValue, List<?> args) { + public String getText(String aTextName, + String defaultValue, + List<?> args) { String value = super.getText(aTextName, defaultValue, args); return getSafeText(aTextName, value); } @Override - public String getText(String key, String defaultValue, String[] args) { + public String getText(String key, + String defaultValue, + String[] args) { String value = super.getText(key, defaultValue, args); return getSafeText(key, value); } @Override - public String getText(String key, String defaultValue, List<?> args, ValueStack stack) { + public String getText(String key, + String defaultValue, + List<?> args, + ValueStack stack) { String value = super.getText(key, defaultValue, args, stack); return getSafeText(key, value); } @Override - public String getText(String key, String defaultValue, String[] args, ValueStack stack) { + public String getText(String key, + String defaultValue, + String[] args, + ValueStack stack) { String value = super.getText(key, defaultValue, args, stack); return getSafeText(key, value); } Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-06-28 12:25:30 UTC (rev 80) @@ -0,0 +1,48 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ +package org.nuiton.web.struts2; + +import org.nuiton.topia.TopiaContext; + +/** + * Use this contract on a object which use a {@code TopiaContext} as a + * transaction. + * <p/> + * The method {@link #getTransaction()} returns the internal transaction used. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public interface TopiaTransactionAware { + + /** + * Obtains the internal transaction. + * <p/> + * If no transaction was opened, can return the {@code null} object. + * + * @return the current transaction (can be null or closed...). + */ + TopiaContext getTransaction(); +} Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java 2011-06-28 12:25:30 UTC (rev 80) @@ -0,0 +1,76 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ +package org.nuiton.web.struts2.interceptor; + +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.nuiton.topia.TopiaContext; +import org.nuiton.web.struts2.TopiaTransactionAware; + +/** + * A interceptor to close the topia transaction in the action (after the result). + * <p/> + * In that way no need to walk inside entities (for lazy problem) and no need + * also to close the opened transaction. + * <p/> + * The action must implements the contract {@link TopiaTransactionAware}. + * + * @author tchemit <chemit(a)codelutin.com> + * @see TopiaTransactionAware + * @since 1.2 + */ +public class CloseTopiaTransactionInterceptor extends AbstractInterceptor { + + private static final long serialVersionUID = 1L; + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + + TopiaTransactionAware transactionAware = null; + + Object action = invocation.getProxy().getAction(); + + if (action instanceof TopiaTransactionAware) { + transactionAware = (TopiaTransactionAware) action; + } + + try { + return invocation.invoke(); + } finally { + if (transactionAware != null) { + + // we are on a action with a internal topia transaction + TopiaContext transaction = transactionAware.getTransaction(); + + if (transaction != null && !transaction.isClosed()) { + + // close the opened transaction + transaction.closeContext(); + } + } + } + + } +} Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/feedback.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-07 20:09:14 UTC (rev 79) +++ trunk/pom.xml 2011-06-28 12:25:30 UTC (rev 80) @@ -108,6 +108,14 @@ <scope>provided</scope> </dependency> +  + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>com.google.gwt</groupId> @@ -207,6 +215,7 @@ <nuitonI18nPluginVersion>2.4</nuitonI18nPluginVersion> <jredminePluginVersion>1.2</jredminePluginVersion> + <topiaVersion>2.6</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion> Property changes on: trunk/pom.xml ___________________________________________________________________ Added: svn:eol-style + native

1 0

r79 - trunk
by tchemit＠users.nuiton.org 07 Jun '11

07 Jun '11

Author: tchemit Date: 2011-06-07 22:09:14 +0200 (Tue, 07 Jun 2011) New Revision: 79 Url: http://nuiton.org/repositories/revision/nuiton-web/79 Log: Update mavenpom4redmineAndCentral to 2.5.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 08:00:54 UTC (rev 78) +++ trunk/pom.xml 2011-06-07 20:09:14 UTC (rev 79) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r78 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by jcouteau＠users.nuiton.org 27 May '11

27 May '11

Author: jcouteau Date: 2011-05-27 10:00:54 +0200 (Fri, 27 May 2011) New Revision: 78 Url: http://nuiton.org/repositories/revision/nuiton-web/78 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 2011-05-27 08:00:52 UTC (rev 77) +++ trunk/nuiton-gwt/pom.xml 2011-05-27 08:00:54 UTC (rev 78) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-05-27 08:00:52 UTC (rev 77) +++ trunk/nuiton-rss/pom.xml 2011-05-27 08:00:54 UTC (rev 78) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-05-27 08:00:52 UTC (rev 77) +++ trunk/nuiton-struts2/pom.xml 2011-05-27 08:00:54 UTC (rev 78) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-05-27 08:00:52 UTC (rev 77) +++ trunk/nuiton-tapestry/pom.xml 2011-05-27 08:00:54 UTC (rev 78) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-05-27 08:00:52 UTC (rev 77) +++ trunk/nuiton-web/pom.xml 2011-05-27 08:00:54 UTC (rev 78) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 08:00:52 UTC (rev 77) +++ trunk/pom.xml 2011-05-27 08:00:54 UTC (rev 78) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -283,11 +283,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.1</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-parent-1.1 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> </project>

1 0

r77 - tags
by jcouteau＠users.nuiton.org 27 May '11

27 May '11

Author: jcouteau Date: 2011-05-27 10:00:52 +0200 (Fri, 27 May 2011) New Revision: 77 Url: http://nuiton.org/repositories/revision/nuiton-web/77 Log: [maven-release-plugin] copy for tag nuiton-web-parent-1.1 Added: tags/nuiton-web-parent-1.1/

1 0

r76 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by jcouteau＠users.nuiton.org 27 May '11

27 May '11

Author: jcouteau Date: 2011-05-27 10:00:50 +0200 (Fri, 27 May 2011) New Revision: 76 Url: http://nuiton.org/repositories/revision/nuiton-web/76 Log: [maven-release-plugin] prepare release nuiton-web-parent-1.1 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 2011-05-27 07:59:29 UTC (rev 75) +++ trunk/nuiton-gwt/pom.xml 2011-05-27 08:00:50 UTC (rev 76) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-05-27 07:59:29 UTC (rev 75) +++ trunk/nuiton-rss/pom.xml 2011-05-27 08:00:50 UTC (rev 76) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-05-27 07:59:29 UTC (rev 75) +++ trunk/nuiton-struts2/pom.xml 2011-05-27 08:00:50 UTC (rev 76) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-05-27 07:59:29 UTC (rev 75) +++ trunk/nuiton-tapestry/pom.xml 2011-05-27 08:00:50 UTC (rev 76) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-05-27 07:59:29 UTC (rev 75) +++ trunk/nuiton-web/pom.xml 2011-05-27 08:00:50 UTC (rev 76) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 07:59:29 UTC (rev 75) +++ trunk/pom.xml 2011-05-27 08:00:50 UTC (rev 76) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> <modules> <module>nuiton-web</module> @@ -283,11 +283,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-parent-1.1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> </scm> </project>

1 0

r75 - trunk/src/site
by jcouteau＠users.nuiton.org 27 May '11

27 May '11

Author: jcouteau Date: 2011-05-27 09:59:29 +0200 (Fri, 27 May 2011) New Revision: 75 Url: http://nuiton.org/repositories/revision/nuiton-web/75 Log: Add svn:keywords Modified: trunk/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-05-27 07:56:22 UTC (rev 74) +++ trunk/src/site/site_fr.xml 2011-05-27 07:59:29 UTC (rev 75) @@ -4,7 +4,7 @@ Nuiton Utils $Id$ - $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/src/site/site_fr.xml $ + $HeadURL$ %% Copyright (C) 2004 - 2010 CodeLutin %% Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r74 - trunk/nuiton-rss/src/main/resources/fckeditor
by jcouteau＠users.nuiton.org 27 May '11

27 May '11

Author: jcouteau Date: 2011-05-27 09:56:22 +0200 (Fri, 27 May 2011) New Revision: 74 Url: http://nuiton.org/repositories/revision/nuiton-web/74 Log: Remove wrong license and add ignore-license Modified: trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js Modified: trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js 2011-05-27 07:40:52 UTC (rev 73) +++ trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js 2011-05-27 07:56:22 UTC (rev 74) @@ -1,28 +1,6 @@ -/* - * #%L - * Nuiton Web :: Nuiton RSS - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2011 CodeLutin - * %% - * 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% - */ -/* +/* + * %%Ignore-License + * * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2008 Frederico Caldeira Knabben *

1 0

r73 - in trunk: . nuiton-rss/src/main/resources/fckeditor nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang nuiton-rss/src/main/webapp nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins
by jcouteau＠users.nuiton.org 27 May '11

27 May '11

Author: jcouteau Date: 2011-05-27 09:40:52 +0200 (Fri, 27 May 2011) New Revision: 73 Url: http://nuiton.org/repositories/revision/nuiton-web/73 Log: Update license headers Change jredmine plugin version Modified: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js trunk/nuiton-rss/src/main/webapp/rssgenerator.js trunk/nuiton-rss/src/main/webapp/rssinclude.js trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js trunk/pom.xml Modified: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2011-05-15 12:37:02 UTC (rev 72) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2011-05-27 07:40:52 UTC (rev 73) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton RSS + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin + * %% + * 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% + */ var dialog = window.parent; var oEditor = dialog.InnerDialogLoaded(); var FCK = oEditor.FCK; Modified: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js 2011-05-15 12:37:02 UTC (rev 72) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js 2011-05-27 07:40:52 UTC (rev 73) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton RSS + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin + * %% + * 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% + */ // Register the related commands. var dialogPath = FCKConfig.PluginsPath + 'rssinclude/fck_rssinclude.html'; var rssincludeDialogCmd = new FCKDialogCommand( FCKLang["DlgRssincludeTitle"], FCKLang["DlgRssincludeTitle"], dialogPath, 480, 470 ); Modified: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js 2011-05-15 12:37:02 UTC (rev 72) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js 2011-05-27 07:40:52 UTC (rev 73) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton RSS + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin + * %% + * 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% + */ // Rssinclude Dialog FCKLang["DlgRssincludeTitle"] = "Rss Include"; FCKLang["DlgRssincludeFeedName"] = "name or URL" ; Modified: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js 2011-05-15 12:37:02 UTC (rev 72) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js 2011-05-27 07:40:52 UTC (rev 73) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton RSS + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin + * %% + * 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% + */ // Rssinclude Dialog FCKLang["DlgRssincludeTitle"] = "Rss Include"; FCKLang["DlgRssincludeFeedName"] = "nom ou URL" ; Modified: trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js 2011-05-15 12:37:02 UTC (rev 72) +++ trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js 2011-05-27 07:40:52 UTC (rev 73) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton RSS + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin + * %% + * 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% + */ /* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2008 Frederico Caldeira Knabben Modified: trunk/nuiton-rss/src/main/webapp/rssgenerator.js =================================================================== --- trunk/nuiton-rss/src/main/webapp/rssgenerator.js 2011-05-15 12:37:02 UTC (rev 72) +++ trunk/nuiton-rss/src/main/webapp/rssgenerator.js 2011-05-27 07:40:52 UTC (rev 73) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton RSS + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin + * %% + * 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% + */ function rssgeneratorUpdateDiv(divs) { var serlvetUrl = "RSSGeneratorServlet?action=list"; win = window; Modified: trunk/nuiton-rss/src/main/webapp/rssinclude.js =================================================================== --- trunk/nuiton-rss/src/main/webapp/rssinclude.js 2011-05-15 12:37:02 UTC (rev 72) +++ trunk/nuiton-rss/src/main/webapp/rssinclude.js 2011-05-27 07:40:52 UTC (rev 73) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton RSS + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin + * %% + * 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% + */ function rssincludeUpdateDiv(div, background) { // mettre background a false est utile lorsque l'on appelle la methode // depuis une fenetre que l'on ferme ensuite Modified: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js =================================================================== --- trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js 2011-05-15 12:37:02 UTC (rev 72) +++ trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js 2011-05-27 07:40:52 UTC (rev 73) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ /** * Dialogue de confirmation */ Modified: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js =================================================================== --- trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js 2011-05-15 12:37:02 UTC (rev 72) +++ trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js 2011-05-27 07:40:52 UTC (rev 73) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ var ZoneUpdater = Class.create(); ZoneUpdater.prototype = { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-15 12:37:02 UTC (rev 72) +++ trunk/pom.xml 2011-05-27 07:40:52 UTC (rev 73) @@ -206,14 +206,15 @@ <projectId>nuiton-web</projectId> <nuitonI18nPluginVersion>2.4</nuitonI18nPluginVersion> + <jredminePluginVersion>1.2</jredminePluginVersion>  <tapestryVersion>5.2.4</tapestryVersion> <slf4jVersion>1.6.1</slf4jVersion>  - <gwtVersion>2.1.0</gwtVersion> - <gwtPluginVersion>2.1.0-1</gwtPluginVersion> + <gwtVersion>2.2.0</gwtVersion> + <gwtPluginVersion>2.2.0</gwtPluginVersion>  <struts2Version>2.2.3</struts2Version>

1 0

r72 - trunk
by tchemit＠users.nuiton.org 15 May '11

15 May '11

Author: tchemit Date: 2011-05-15 14:37:02 +0200 (Sun, 15 May 2011) New Revision: 72 Url: http://nuiton.org/repositories/revision/nuiton-web/72 Log: Evolution #1531: Updates to i18n 2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-14 11:45:06 UTC (rev 71) +++ trunk/pom.xml 2011-05-15 12:37:02 UTC (rev 72) @@ -205,7 +205,7 @@  <projectId>nuiton-web</projectId> - <nuitonI18nPluginVersion>2.4-SNAPSHOT</nuitonI18nPluginVersion> + <nuitonI18nPluginVersion>2.4</nuitonI18nPluginVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r71 - trunk
by tchemit＠users.nuiton.org 14 May '11

14 May '11

Author: tchemit Date: 2011-05-14 13:45:06 +0200 (Sat, 14 May 2011) New Revision: 71 Url: http://nuiton.org/repositories/revision/nuiton-web/71 Log: Update mavenpom4redmineAndCentral to 2.5.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-11 10:20:20 UTC (rev 70) +++ trunk/pom.xml 2011-05-14 11:45:06 UTC (rev 71) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.3</version> + <version>2.5.4</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r70 - trunk/nuiton-struts2
by tchemit＠users.nuiton.org 11 May '11

11 May '11

Author: tchemit Date: 2011-05-11 12:20:20 +0200 (Wed, 11 May 2011) New Revision: 70 Url: http://nuiton.org/repositories/revision/nuiton-web/70 Log: optimize dependencies Modified: trunk/nuiton-struts2/pom.xml Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-05-11 08:07:46 UTC (rev 69) +++ trunk/nuiton-struts2/pom.xml 2011-05-11 10:20:20 UTC (rev 70) @@ -30,6 +30,11 @@ </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency>

1 0

r69 - in trunk: . nuiton-struts2/src/license nuiton-struts2/src/main/java/org/nuiton/web/struts2
by tchemit＠users.nuiton.org 11 May '11

11 May '11

Author: tchemit Date: 2011-05-11 10:07:46 +0200 (Wed, 11 May 2011) New Revision: 69 Url: http://nuiton.org/repositories/revision/nuiton-web/69 Log: fix plugin version updates to struts2 2.2.3 Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java trunk/pom.xml Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-05-10 21:36:26 UTC (rev 68) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-05-11 08:07:46 UTC (rev 69) @@ -2,13 +2,16 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License -# - BSD-style license # - Common Public License Version 1.0 -# - MIT License # - The Apache Software License, Version 2.0 +# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue May 10 16:16:41 CEST 2011 -ognl--ognl--3.0--jar=The Apache Software License, Version 2.0 +#Wed May 11 10:01:56 CEST 2011 +asm--asm--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html +javassist--javassist--3.11.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +ognl--ognl--3.0.1--jar=The Apache Software License, Version 2.0 Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-05-10 21:36:26 UTC (rev 68) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-05-11 08:07:46 UTC (rev 69) @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.util.ValueStack; -import org.apache.commons.lang.xwork.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -76,7 +76,7 @@ } @Override - public String getText(String aTextName, List<Object> args) { + public String getText(String aTextName, List<?> args) { String value = super.getText(aTextName, args); return getSafeText(aTextName, value); } @@ -88,7 +88,7 @@ } @Override - public String getText(String aTextName, String defaultValue, List<Object> args) { + public String getText(String aTextName, String defaultValue, List<?> args) { String value = super.getText(aTextName, defaultValue, args); return getSafeText(aTextName, value); } @@ -100,7 +100,7 @@ } @Override - public String getText(String key, String defaultValue, List<Object> args, ValueStack stack) { + public String getText(String key, String defaultValue, List<?> args, ValueStack stack) { String value = super.getText(key, defaultValue, args, stack); return getSafeText(key, value); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-10 21:36:26 UTC (rev 68) +++ trunk/pom.xml 2011-05-11 08:07:46 UTC (rev 69) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -42,8 +44,8 @@ <artifactId>jetty-webapp</artifactId> <version>7.1.0.v20100505</version> </dependency> - -  + +  <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> @@ -81,7 +83,7 @@ <scope>runtime</scope> </dependency> -  +  <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> @@ -107,7 +109,7 @@ <version>2.5</version> <scope>provided</scope> </dependency> - +  <dependency> <groupId>com.google.gwt</groupId> @@ -205,6 +207,8 @@  <projectId>nuiton-web</projectId> + <nuitonI18nPluginVersion>2.4-SNAPSHOT</nuitonI18nPluginVersion> +  <tapestryVersion>5.2.4</tapestryVersion> <slf4jVersion>1.6.1</slf4jVersion> @@ -214,7 +218,7 @@ <gwtPluginVersion>2.1.0-1</gwtPluginVersion>  - <struts2Version>2.2.1.1</struts2Version> + <struts2Version>2.2.3</struts2Version>  <siteLocales>en,fr</siteLocales> @@ -230,7 +234,7 @@ <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> - + <build> <pluginManagement> @@ -246,6 +250,19 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nPluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwtPluginVersion}</version> + </plugin> + </plugins> </pluginManagement>

1 0

r68 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 10 May '11

10 May '11

Author: tchemit Date: 2011-05-10 23:36:26 +0200 (Tue, 10 May 2011) New Revision: 68 Url: http://nuiton.org/repositories/revision/nuiton-web/68 Log: remove unused interceptor Removed: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java Deleted: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java 2011-05-10 14:34:24 UTC (rev 67) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java 2011-05-10 21:36:26 UTC (rev 68) @@ -1,109 +0,0 @@ -/* - * #%L - * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit - * %% - * 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% - */ - -package org.nuiton.web.struts2.interceptor; - -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; -import com.opensymphony.xwork2.util.reflection.ReflectionProviderFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.InputStream; -import java.lang.reflect.Method; - -/** - * A interceptor to download a stream. - * <p/> - * The main purpose of this one is to clean nicely the incoming stream. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.1 - */ -public class DownloadInterceptor extends AbstractInterceptor { - - /** Logger. */ - private static final Log log = LogFactory.getLog(DownloadInterceptor.class); - - private static final long serialVersionUID = 1L; - - /** - * Name of the field containing the stream in the action. - * <p/> - * By default, use as in result of type stream the value - * {@code inputStream}. - */ - protected String inputName = "inputStream"; - - public void setInputName(String inputName) { - this.inputName = inputName; - } - - @Override - public void init() { - super.init(); - if (log.isInfoEnabled()) { - log.info("Init interceptor..."); - } - } - - @Override - public String intercept(ActionInvocation invocation) throws Exception { - - Object action = invocation.getAction(); - - ReflectionProvider reflectionProvider = - ReflectionProviderFactory.getInstance(); - - Method getMethod; - - try { - getMethod = reflectionProvider.getGetMethod(action.getClass(), inputName); - } catch (Exception e) { - throw new IllegalStateException("Could not find field accessor for property name " + inputName + " in action " + action.getClass()); - } - - if (!InputStream.class.isAssignableFrom(getMethod.getReturnType())) { - throw new IllegalStateException("field for property name " + inputName + " in action " + action.getClass() + " is not a InputStream, but " + getMethod.getReturnType().getName()); - } - - try { - // let's invoke action and rest of interceptors - String invoke = invocation.invoke(); - return invoke; - } finally { - - InputStream inputStream = (InputStream) getMethod.invoke(action); - - if (log.isDebugEnabled()) { - log.debug("Will close inputStream " + inputStream); - } - // do close the input stream... - inputStream.close(); - } - - } -}

1 0

r67 - in trunk: . nuiton-struts2 nuiton-struts2/src nuiton-struts2/src/license nuiton-struts2/src/main nuiton-struts2/src/main/java nuiton-struts2/src/main/java/org nuiton-struts2/src/main/java/org/nuiton nuiton-struts2/src/main/java/org/nuiton/web nuiton-struts2/src/main/java/org/nuiton/web/struts2 nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 10 May '11

10 May '11

Author: tchemit Date: 2011-05-10 16:34:24 +0200 (Tue, 10 May 2011) New Revision: 67 Url: http://nuiton.org/repositories/revision/nuiton-web/67 Log: Evolution #1430: Add a struts2 module Added: trunk/nuiton-struts2/ trunk/nuiton-struts2/LICENSE.txt trunk/nuiton-struts2/README.txt trunk/nuiton-struts2/changelog.txt trunk/nuiton-struts2/pom.xml trunk/nuiton-struts2/src/ trunk/nuiton-struts2/src/license/ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties trunk/nuiton-struts2/src/main/ trunk/nuiton-struts2/src/main/java/ trunk/nuiton-struts2/src/main/java/org/ trunk/nuiton-struts2/src/main/java/org/nuiton/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java trunk/nuiton-struts2/src/main/resources/ Modified: trunk/pom.xml Property changes on: trunk/nuiton-struts2 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: trunk/nuiton-struts2/LICENSE.txt =================================================================== --- trunk/nuiton-struts2/LICENSE.txt (rev 0) +++ trunk/nuiton-struts2/LICENSE.txt 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: trunk/nuiton-struts2/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/README.txt =================================================================== --- trunk/nuiton-struts2/README.txt (rev 0) +++ trunk/nuiton-struts2/README.txt 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1 @@ + Property changes on: trunk/nuiton-struts2/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/changelog.txt =================================================================== --- trunk/nuiton-struts2/changelog.txt (rev 0) +++ trunk/nuiton-struts2/changelog.txt 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,2 @@ +Please refer to the release note : + http://maven-site.nuiton.org/nuiton-tapestry/changes-report.html \ No newline at end of file Property changes on: trunk/nuiton-struts2/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml (rev 0) +++ trunk/nuiton-struts2/pom.xml 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web-parent</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> + + <artifactId>nuiton-struts2</artifactId> + + <dependencies> + +  + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + +  +  +  + + <name>Nuiton Web :: Nuiton Struts 2</name> + <description>Extra classes for Struts 2 based applications</description> + +  +  +  + + <packaging>jar</packaging> + + + <build> + <plugins> + + </plugins> + </build> + +</project> Property changes on: trunk/nuiton-struts2/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,14 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - BSD-style license +# - Common Public License Version 1.0 +# - MIT License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue May 10 16:16:41 CEST 2011 +ognl--ognl--3.0--jar=The Apache Software License, Version 2.0 Property changes on: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,124 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit + * %% + * 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% + */ +package org.nuiton.web.struts2; + +import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.util.ValueStack; +import org.apache.commons.lang.xwork.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Arrays; +import java.util.List; + +/** + * Base action to use for a better usage of I18n. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public class BaseAction extends ActionSupport { + + private static final long serialVersionUID = 1L; + + public static final String UNTRANSLATED_MARKER = "???"; + + private static final Log log = LogFactory.getLog(BaseAction.class); + + public String _(String aTextName) { + String value = getText(aTextName); + return value; + } + + public String _(String key, Object... args) { + String value = getText(key, Arrays.asList(args)); + return value; + } + + @Override + public String getText(String aTextName) { + String value = super.getText(aTextName); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String aTextName, String defaultValue) { + String value = super.getText(aTextName, defaultValue); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String aTextName, String defaultValue, String obj) { + String value = super.getText(aTextName, defaultValue, obj); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String aTextName, List<Object> args) { + String value = super.getText(aTextName, args); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String key, String[] args) { + String value = super.getText(key, args); + return getSafeText(key, value); + } + + @Override + public String getText(String aTextName, String defaultValue, List<Object> args) { + String value = super.getText(aTextName, defaultValue, args); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String key, String defaultValue, String[] args) { + String value = super.getText(key, defaultValue, args); + return getSafeText(key, value); + } + + @Override + public String getText(String key, String defaultValue, List<Object> args, ValueStack stack) { + String value = super.getText(key, defaultValue, args, stack); + return getSafeText(key, value); + } + + @Override + public String getText(String key, String defaultValue, String[] args, ValueStack stack) { + String value = super.getText(key, defaultValue, args, stack); + return getSafeText(key, value); + } + + protected String getSafeText(String key, String value) { + if (StringUtils.isEmpty(value)) { + if (log.isWarnEnabled()) { + log.warn("Key [" + key + "] is not translated"); + } + return UNTRANSLATED_MARKER + key + UNTRANSLATED_MARKER; + } + return value; + } + +} Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,109 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit + * %% + * 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% + */ + +package org.nuiton.web.struts2.interceptor; + +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import com.opensymphony.xwork2.util.reflection.ReflectionProviderFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.InputStream; +import java.lang.reflect.Method; + +/** + * A interceptor to download a stream. + * <p/> + * The main purpose of this one is to clean nicely the incoming stream. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public class DownloadInterceptor extends AbstractInterceptor { + + /** Logger. */ + private static final Log log = LogFactory.getLog(DownloadInterceptor.class); + + private static final long serialVersionUID = 1L; + + /** + * Name of the field containing the stream in the action. + * <p/> + * By default, use as in result of type stream the value + * {@code inputStream}. + */ + protected String inputName = "inputStream"; + + public void setInputName(String inputName) { + this.inputName = inputName; + } + + @Override + public void init() { + super.init(); + if (log.isInfoEnabled()) { + log.info("Init interceptor..."); + } + } + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + + Object action = invocation.getAction(); + + ReflectionProvider reflectionProvider = + ReflectionProviderFactory.getInstance(); + + Method getMethod; + + try { + getMethod = reflectionProvider.getGetMethod(action.getClass(), inputName); + } catch (Exception e) { + throw new IllegalStateException("Could not find field accessor for property name " + inputName + " in action " + action.getClass()); + } + + if (!InputStream.class.isAssignableFrom(getMethod.getReturnType())) { + throw new IllegalStateException("field for property name " + inputName + " in action " + action.getClass() + " is not a InputStream, but " + getMethod.getReturnType().getName()); + } + + try { + // let's invoke action and rest of interceptors + String invoke = invocation.invoke(); + return invoke; + } finally { + + InputStream inputStream = (InputStream) getMethod.invoke(action); + + if (log.isDebugEnabled()) { + log.debug("Will close inputStream " + inputStream); + } + // do close the input stream... + inputStream.close(); + } + + } +} Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 08:46:27 UTC (rev 66) +++ trunk/pom.xml 2011-05-10 14:34:24 UTC (rev 67) @@ -19,6 +19,7 @@ <modules> <module>nuiton-web</module> + <module>nuiton-struts2</module> <module>nuiton-tapestry</module> <module>nuiton-rss</module> <module>nuiton-gwt</module> @@ -115,6 +116,37 @@ <scope>provided</scope> </dependency> +  + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-dojo-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <version>2.5.0</version> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${struts2Version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </dependencyManagement> @@ -181,6 +213,9 @@ <gwtVersion>2.1.0</gwtVersion> <gwtPluginVersion>2.1.0-1</gwtPluginVersion> +  + <struts2Version>2.2.1.1</struts2Version> +  <siteLocales>en,fr</siteLocales>

1 0

r66 - trunk
by tchemit＠users.nuiton.org 11 Apr '11

11 Apr '11

Author: tchemit Date: 2011-04-11 10:46:27 +0200 (Mon, 11 Apr 2011) New Revision: 66 Url: http://nuiton.org/repositories/revision/nuiton-web/66 Log: Update mavenpom4redmineAndCentral to 2.5.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-23 12:03:49 UTC (rev 65) +++ trunk/pom.xml 2011-04-11 08:46:27 UTC (rev 66) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r65 - trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table
by jcouteau＠users.nuiton.org 23 Mar '11

23 Mar '11

Author: jcouteau Date: 2011-03-23 13:03:49 +0100 (Wed, 23 Mar 2011) New Revision: 65 Url: http://nuiton.org/repositories/revision/nuiton-web/65 Log: Evolution #1418: Allow to put HTML strings in tables Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java 2011-03-22 15:50:33 UTC (rev 64) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java 2011-03-23 12:03:49 UTC (rev 65) @@ -108,9 +108,9 @@ if (value instanceof Widget) { setWidget(row+1, col, (Widget) value); } else if (value == null) { - setText(row+1, col, ""); + setHTML(row+1, col, ""); } else { - setText(row+1, col, value.toString()); + setHTML(row+1, col, value.toString()); } } Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-03-22 15:50:33 UTC (rev 64) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-03-23 12:03:49 UTC (rev 65) @@ -114,9 +114,9 @@ if (value instanceof Widget) { setWidget(row + 1, col, (Widget) value); } else if (value == null) { - setText(row + 1, col, ""); + setHTML(row + 1, col, ""); } else { - setText(row + 1, col, value.toString()); + setHTML(row + 1, col, value.toString()); } }

1 0

r64 - trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table
by jcouteau＠users.nuiton.org 22 Mar '11

22 Mar '11

Author: jcouteau Date: 2011-03-22 16:50:33 +0100 (Tue, 22 Mar 2011) New Revision: 64 Url: http://nuiton.org/repositories/revision/nuiton-web/64 Log: Anomalie #1412: SortableFlexTable does not display last column Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-03-12 14:21:48 UTC (rev 63) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-03-22 15:50:33 UTC (rev 64) @@ -91,7 +91,7 @@ } } } else { - for (int i = firstColumn; i < lastColumn; i++) { + for (int i = firstColumn; i <= lastColumn; i++) { if (firstRow == lastRow) { Object value = model.getValueAt(i, firstRow);

1 0

r63 - trunk
by tchemit＠users.nuiton.org 12 Mar '11

12 Mar '11

Author: tchemit Date: 2011-03-12 15:21:48 +0100 (Sat, 12 Mar 2011) New Revision: 63 Url: http://nuiton.org/repositories/revision/nuiton-web/63 Log: Update mavenpom4redmineAndCentral to 2.5.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-10 09:38:54 UTC (rev 62) +++ trunk/pom.xml 2011-03-12 14:21:48 UTC (rev 63) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r62 - in trunk/nuiton-gwt/src/main: java/org/nuiton/web/gwt/messages resources/i18n
by jcouteau＠users.nuiton.org 10 Mar '11

10 Mar '11

Author: jcouteau Date: 2011-03-10 10:38:54 +0100 (Thu, 10 Mar 2011) New Revision: 62 Url: http://nuiton.org/repositories/revision/nuiton-web/62 Log: Fix old i18n key Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java 2011-03-09 11:08:06 UTC (rev 61) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java 2011-03-10 09:38:54 UTC (rev 62) @@ -29,6 +29,6 @@ */ public interface UIMessages extends Messages { - @Key("refcomp.loading") + @Key("nuiton.gwt.loading") String loading(); } \ No newline at end of file Modified: trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties =================================================================== --- trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties 2011-03-09 11:08:06 UTC (rev 61) +++ trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties 2011-03-10 09:38:54 UTC (rev 62) @@ -1 +1 @@ -refcomp.loading=Loading, please wait +nuiton.gwt.loading=Loading, please wait Modified: trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties =================================================================== --- trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties 2011-03-09 11:08:06 UTC (rev 61) +++ trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties 2011-03-10 09:38:54 UTC (rev 62) @@ -1 +1 @@ -refcomp.loading=Chargement, veuillez patienter +nuiton.gwt.loading=Chargement, veuillez patienter

1 0

r61 - trunk
by jcouteau＠users.nuiton.org 09 Mar '11

09 Mar '11

Author: jcouteau Date: 2011-03-09 12:08:06 +0100 (Wed, 09 Mar 2011) New Revision: 61 Url: http://nuiton.org/repositories/revision/nuiton-web/61 Log: Forgot the pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-09 11:01:10 UTC (rev 60) +++ trunk/pom.xml 2011-03-09 11:08:06 UTC (rev 61) @@ -21,6 +21,7 @@ <module>nuiton-web</module> <module>nuiton-tapestry</module> <module>nuiton-rss</module> + <module>nuiton-gwt</module> </modules> <dependencyManagement> @@ -105,6 +106,14 @@ <version>2.5</version> <scope>provided</scope> </dependency> + +  + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwtVersion}</version> + <scope>provided</scope> + </dependency> </dependencies> @@ -141,6 +150,16 @@ <role>Développeur</role> </roles> </developer> + <developer> + <id>jcouteau</id> + <name>Jean Couteau</name> + <email>couteau(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> </developers>  @@ -158,6 +177,10 @@ <tapestryVersion>5.2.4</tapestryVersion> <slf4jVersion>1.6.1</slf4jVersion> +  + <gwtVersion>2.1.0</gwtVersion> + <gwtPluginVersion>2.1.0-1</gwtPluginVersion> +  <siteLocales>en,fr</siteLocales>

1 0

09 Mar '11

Author: jcouteau Date: 2011-03-09 12:01:10 +0100 (Wed, 09 Mar 2011) New Revision: 60 Url: http://nuiton.org/repositories/revision/nuiton-web/60 Log: Evolution #1384: Add a gwt module Added: trunk/nuiton-gwt/ trunk/nuiton-gwt/LICENSE.txt trunk/nuiton-gwt/README.txt trunk/nuiton-gwt/changelog.txt trunk/nuiton-gwt/pom.xml trunk/nuiton-gwt/src/ trunk/nuiton-gwt/src/main/ trunk/nuiton-gwt/src/main/java/ trunk/nuiton-gwt/src/main/java/org/ trunk/nuiton-gwt/src/main/java/org/nuiton/ trunk/nuiton-gwt/src/main/java/org/nuiton/web/ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableButton.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableListBox.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/BlindedPopup.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/LoaderNotification.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/ 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/FlexTableWithModel.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/SortableFlexTableWithModel.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 trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelListener.java trunk/nuiton-gwt/src/main/resources/ trunk/nuiton-gwt/src/main/resources/i18n/ trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties Property changes on: trunk/nuiton-gwt ___________________________________________________________________ Added: svn:ignore + *.iml target Added: trunk/nuiton-gwt/LICENSE.txt =================================================================== --- trunk/nuiton-gwt/LICENSE.txt (rev 0) +++ trunk/nuiton-gwt/LICENSE.txt 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: trunk/nuiton-gwt/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/README.txt =================================================================== --- trunk/nuiton-gwt/README.txt (rev 0) +++ trunk/nuiton-gwt/README.txt 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1 @@ + Property changes on: trunk/nuiton-gwt/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/changelog.txt =================================================================== --- trunk/nuiton-gwt/changelog.txt (rev 0) +++ trunk/nuiton-gwt/changelog.txt 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,2 @@ +Please refer to the release note : + http://maven-site.nuiton.org/nuiton-gwt/changes-report.html \ No newline at end of file Property changes on: trunk/nuiton-gwt/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml (rev 0) +++ trunk/nuiton-gwt/pom.xml 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web-parent</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> + + <artifactId>nuiton-gwt</artifactId> + + <dependencies> + +  + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + </dependency> + + + </dependencies> + +  +  +  + + <name>Nuiton Web :: Nuiton GWT</name> + <description>Extra classes for GWT based applications</description> + +  +  +  + + <packaging>jar</packaging> + + + <build> + <plugins> + <plugin> + +  + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <id>scan-gwt-java-source</id> + <goals> + <goal>parserGWTJava</goal> + </goals> + </execution> + <execution> + <id>gen</id> + <goals> + <goal>gen</goal> + </goals> + <configuration> + <bundles>fr_FR,en_GB</bundles> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>resources</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> Property changes on: trunk/nuiton-gwt/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,34 @@ + +<!DOCTYPE module PUBLIC "//gwt-module/" + "http://google-web-toolkit.googlecode.com/svn/tags/1.6.2/distro-source/core/…"> +<module> + +  + <inherits name='com.google.gwt.user.User'/> + + <source path="comparable"/> + <source path="messages"/> + <source path="misc"/> + <source path="table"/> + +</module> \ No newline at end of file Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,48 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ + +package org.nuiton.web.gwt.comparable; + +import com.google.gwt.user.client.ui.Anchor; + +/** + * + * Anchor that implements Comparable to be used in SortableTables. Comparison is + * made on the text of the anchor. + * + * @author jcouteau + * @since 1.1 + */ +public class ComparableAnchor extends Anchor implements Comparable<Anchor> { + + public ComparableAnchor(String value){ + super(value); + } + + @Override + public int compareTo(Anchor o) { + String oValue = o.getText(); + String value = getText(); + + return value.compareTo(oValue); + } +} \ No newline at end of file Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableButton.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableButton.java (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableButton.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,44 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ + +package org.nuiton.web.gwt.comparable; + +import com.google.gwt.user.client.ui.Button; + +/** + * + * Button that implements Comparable to be used in SortableTables. Comparison is + * made on Button text. + * + * @author jcouteau + * @since 1.1 + */ +public class ComparableButton extends Button implements Comparable<Button> { + + @Override + public int compareTo(Button o) { + String oValue = o.getText(); + String value = getText(); + + return value.compareTo(oValue); + } +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableButton.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableListBox.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableListBox.java (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableListBox.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,44 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ + +package org.nuiton.web.gwt.comparable; + +import com.google.gwt.user.client.ui.ListBox; + +/** + * + * ListBox that implements Comaprable to be used in SortableTables. Comparison + * is made on the selected value text. + * + * @author jcouteau + * @since 1.1 + */ +public class ComparableListBox extends ListBox implements Comparable<ListBox> { + + @Override + public int compareTo(ListBox o) { + String oSelectedValue = o.getItemText(o.getSelectedIndex()); + String selectedValue = getItemText(getSelectedIndex()); + + return selectedValue.compareTo(oSelectedValue); + } +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableListBox.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,34 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ +package org.nuiton.web.gwt.messages; + +import com.google.gwt.i18n.client.Messages; + +/** + * User: couteau + * Date: 31/12/10 + */ +public interface UIMessages extends Messages { + + @Key("refcomp.loading") + String loading(); +} \ No newline at end of file Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/BlindedPopup.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/BlindedPopup.java (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/BlindedPopup.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,124 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ +package org.nuiton.web.gwt.misc; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.Widget; + +/** + * + * This class provides a popup with a glasspanel behind so that users can't + * interact with things that are behind. + * + * Use it like that : + * + * <code> + * new BlindedPopup(myPopupContent); + * </code> + * + * If you want to hide your BlindedPopup from the popup content use : + * + * <code> + * ((BlindedPopup)this.getParent()).hide(); + * </code> + * + * So that the BlindedPopup works completely, you must have a 'wrapper' div + * that is 100% width and height and the your website content inside : + * + * <code> + * <body> + * + * <div id="wrapper"> + *  + * </div> + * + * </body> + * </code> + * + * <code> + * #wrapper { + * height : 100%; + * width : 100%; + * overflow : scroll; + * position:relative; + * } + * </code> + * + * @author jcouteau + * @since 1.1 + */ +public class BlindedPopup extends PopupPanel implements ClickHandler { + PopupPanel glass; + + public BlindedPopup(Widget widget) { + //init popup + super(false); + + /********************************************* + * A glass panel or 'blinder' + * to wash out the current screen + ********************************************/ + glass = new PopupPanel(); + glass.setStyleName("rx-glass"); + /* + * Set full screen + */ + DOM.setStyleAttribute(glass.getElement(), "width", "100%"); + DOM.setStyleAttribute(glass.getElement(), "height", "100%"); + /* + * Add default styles if required + */ + DOM.setStyleAttribute(glass.getElement(), + "backgroundColor", "#000"); + DOM.setStyleAttribute(glass.getElement(), + "opacity", "0.70"); +// DOM.setStyleAttribute(glass.getElement(), +// "-moz-opacity", "0.70"); + DOM.setStyleAttribute(glass.getElement(), + "filter", " alpha(opacity=70)"); + /********************************************** + * A popup + *********************************************/ + setStyleName("rx-BlindedPopup"); + + setWidget(widget); + + /* + * Show the glass first, then the popup will be over it + */ + glass.show(); + center(); + } + + @Override + public void onClick(ClickEvent event) { + hide(); + } + + public void hide() { + glass.hide(); + super.hide(); + } +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/BlindedPopup.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/LoaderNotification.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/LoaderNotification.java (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/LoaderNotification.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,66 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ +package org.nuiton.web.gwt.misc; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.Label; +import org.nuiton.web.gwt.messages.UIMessages; + +/** + * + * Waiting screen that blocks the user so that he can wait during long + * operations. + * + * To display it, use : + * <code> + * LoaderNotification.openLoaderPanel(); + * </code> + * + * To remove it, use : + * <code> + * LoaderNotification.cloaseLoader(); + * </code> + * + * To style it, use the CSS class : <code>loading</code> + * + * @author jcouteau + * @since 1.1 + */ +public class LoaderNotification { + + protected static BlindedPopup glassPanel = null; + + public static void openLoaderPanel() { + + UIMessages messages = GWT.create(UIMessages.class); + + Label label = new Label(messages.loading()); + label.setStyleName("loading"); + glassPanel = new BlindedPopup(label); + } + + public static void closeLoader() { + if (glassPanel != null) { + glassPanel.hide(); + } + } +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/misc/LoaderNotification.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: 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 (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/AbstractGWTTableModel.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,265 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ + +package org.nuiton.web.gwt.table; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.EventListener; +import java.util.List; + +/** + * @author jcouteau + * @since 1.1 + */ +public abstract class AbstractGWTTableModel implements Serializable, GWTTableModel{ + + static final long serialVersionUID = -5798593159423650347L; + + /** + * Storage for the listeners registered with this model. + */ + protected List<TableModelListener> listenerList = new ArrayList<TableModelListener>(); + + /** + * Creates a default instance. + */ + public AbstractGWTTableModel() { + // no setup required here + } + + /** + * Returns the name of the specified column. This method generates default + * names in a sequence (starting with column 0): A, B, C, ..., Z, AA, AB, + * AC, ..., AZ, BA, BB, BC, and so on. Subclasses may override this method + * to allow column names to be specified on some other basis. + * + * @param columnIndex the column index. + * + * @return The name of the column. + */ + public String getColumnName(int columnIndex) { + StringBuffer buffer = new StringBuffer(); + while (columnIndex >= 0) { + buffer.insert(0, (char) ('A' + columnIndex % 26)); + columnIndex = columnIndex / 26 - 1; + } + return buffer.toString(); + } + + /** + * Return the index of the specified column, or <code>-1</code> if there is + * no column with the specified name. + * + * @param columnName the name of the column (<code>null</code> not permitted). + * + * @return The index of the column, -1 if not found. + * + * @see #getColumnName(int) + * @throws NullPointerException if <code>columnName</code> is + * <code>null</code>. + */ + public int findColumn(String columnName) { + int count = getColumnCount(); + + for (int index = 0; index < count; index++) { + String name = getColumnName(index); + if (columnName.equals(name)) { + return index; + } + } + + // Unable to locate. + return -1; + } + + + /** + * Returns the <code>Class</code> for all <code>Object</code> instances + * in the specified column. + * + * @param columnIndex the column index. + * + * @return The class. + */ + public Class<?> getColumnClass(int columnIndex) { + return Object.class; + } + + /** + * Returns <code>true</code> if the specified cell is editable, and + * <code>false</code> if it is not. This implementation returns + * <code>false</code> for all arguments, subclasses should override the + * method if necessary. + * + * @param rowIndex the row index of the cell. + * @param columnIndex the column index of the cell. + * + * @return <code>false</code>. + */ + public boolean isCellEditable(int rowIndex, int columnIndex) { + return false; + } + + /** + * Sets the value of the given cell. This implementation ignores all + * arguments and does nothing, subclasses should override the + * method if necessary. + * + * @param value the new value (<code>null</code> permitted). + * @param rowIndex the row index of the cell. + * @param columnIndex the column index of the cell. + */ + public void setValueAt(Object value, int rowIndex, int columnIndex) { + // Do nothing... + } + + /** + * Adds a listener to the table model. The listener will receive notification + * of all changes to the table model. + * + * @param listener the listener. + */ + public void addTableModelListener(TableModelListener listener) { + listenerList.add(listener); + } + + /** + * Removes a listener from the table model so that it will no longer receive + * notification of changes to the table model. + * + * @param listener the listener to remove. + */ + public void removeTableModelListener(TableModelListener listener) { + listenerList.remove(listener); + } + + /** + * Returns an array containing the listeners that have been added to the + * table model. + * + * @return Array of {@link TableModelListener} objects. + * + * @since 1.4 + */ + public TableModelListener[] getTableModelListeners() { + + TableModelListener[] listeners = new TableModelListener[]{}; + + listeners = listenerList.toArray(listeners); + + return listeners; + } + + /** + * Sends a {@link TableModelEvent} to all registered listeners to inform + * them that the table data has changed. + */ + public void fireTableDataChanged() { + fireTableChanged(new TableModelEvent(this, 0, Integer.MAX_VALUE)); + } + + /** + * Sends a {@link TableModelEvent} to all registered listeners to inform + * them that the table structure has changed. + */ + public void fireTableStructureChanged() { + fireTableChanged(new TableModelEvent(this, TableModelEvent.HEADER_ROW)); + } + + /** + * Sends a {@link TableModelEvent} to all registered listeners to inform + * them that some rows have been inserted into the model. + * + * @param firstRow the index of the first row. + * @param lastRow the index of the last row. + */ + public void fireTableRowsInserted(int firstRow, int lastRow) { + fireTableChanged(new TableModelEvent(this, firstRow, lastRow, + TableModelEvent.ALL_COLUMNS, TableModelEvent.INSERT)); + } + + /** + * Sends a {@link TableModelEvent} to all registered listeners to inform + * them that some rows have been updated. + * + * @param firstRow the index of the first row. + * @param lastRow the index of the last row. + */ + public void fireTableRowsUpdated(int firstRow, int lastRow) { + fireTableChanged(new TableModelEvent(this, firstRow, lastRow, + TableModelEvent.ALL_COLUMNS, TableModelEvent.UPDATE)); + } + + /** + * Sends a {@link TableModelEvent} to all registered listeners to inform + * them that some rows have been deleted from the model. + * + * @param firstRow the index of the first row. + * @param lastRow the index of the last row. + */ + public void fireTableRowsDeleted(int firstRow, int lastRow) { + fireTableChanged(new TableModelEvent(this, firstRow, lastRow, + TableModelEvent.ALL_COLUMNS, TableModelEvent.DELETE)); + } + + /** + * Sends a {@link TableModelEvent} to all registered listeners to inform + * them that a single cell has been updated. + * + * @param row the row index. + * @param column the column index. + */ + public void fireTableCellUpdated(int row, int column) { + fireTableChanged(new TableModelEvent(this, row, row, column)); + } + + /** + * Sends the specified event to all registered listeners. + * + * @param event the event to send. + */ + public void fireTableChanged(TableModelEvent event) { + TableModelListener[] list = getTableModelListeners(); + + for (TableModelListener listener:list){ + listener.tableChanged(event); + } + } + + /** + * Returns an array of listeners of the given type that are registered with + * this model. + * + * @param listenerType the listener class. + * + * @return An array of listeners (possibly empty). + */ + public <T extends EventListener> T[] getListeners(Class<T> listenerType) { + + if (listenerType.getName().equals(TableModelListener.class.getName())){ + return (T[])getTableModelListeners(); + } else { + return (T[])new Object[]{}; + } + } +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/AbstractGWTTableModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: 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 (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/DefaultTableModel.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,625 @@ + +/* DefaultTableModel.java + * Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc. + * + * This file is part of GNU Classpath. + * + * GNU Classpath is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * GNU Classpath 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. + * + * You should have received a copy of the GNU General Public License + * along with GNU Classpath; see the file COPYING. If not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + * + * Linking this library statically or dynamically with other modules is + * making a combined work based on this library. Thus, the terms and + * conditions of the GNU General Public License cover the whole + * combination. + * + * As a special exception, the copyright holders of this library give you + * permission to link this library with independent modules to produce an + * executable, regardless of the license terms of these independent + * modules, and to copy and distribute the resulting executable under + * terms of your choice, provided that you also meet, for each linked + * independent module, the terms and conditions of the license of that + * module. An independent module is a module which is not derived from + * or based on this library. If you modify this library, you may extend + * this exception to your version of the library, but you are not + * obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * + * %%Ignore-License + */ + +package org.nuiton.web.gwt.table; + +import java.io.Serializable; +import java.util.Arrays; +import java.util.Vector; + +/** + * A two dimensional data structure used to store <code>Object</code> + * instances, usually for display in a <code>JTable</code> component. + * + * @author Andrew Selkirk + */ +public class DefaultTableModel extends AbstractGWTTableModel + implements Serializable { + + static final long serialVersionUID=6680042567037222321L; + + /** + * Storage for the rows in the table (each row is itself + * a <code>Vector</code>). + */ + protected Vector<Vector> dataVector; + + /** + * Storage for the column identifiers. + */ + protected Vector columnIdentifiers; + + /** + * Creates an empty table with zero rows and zero columns. + */ + public DefaultTableModel() { + this(0,0); + } + + /** + * Creates a new table with the specified number of rows and columns. + * All cells in the table are initially empty (set to <code>null</code>). + * + * @param numRows the number of rows. + * @param numColumns the number of columns. + */ + public DefaultTableModel(int numRows,int numColumns) { + Vector defaultNames=new Vector(numColumns); + Vector data=new Vector(numRows); + for(int i=0;i<numColumns;i++) { + defaultNames.add(super.getColumnName(i)); + } + for(int r=0;r<numRows;r++) { + Vector tmp=new Vector(numColumns); + tmp.setSize(numColumns); + data.add(tmp); + } + + setDataVector(data, defaultNames); + } + + /** + * Creates a new table with the specified column names and number of + * rows. The number of columns is determined by the number of column + * names supplied. + * + * @param columnNames the column names. + * @param numRows the number of rows. + */ + public DefaultTableModel(Vector columnNames,int numRows) { + if(numRows<0) { + throw new IllegalArgumentException("numRows < 0"); + } + Vector data=new Vector(); + int numColumns=0; + + if(columnNames!=null) { + numColumns=columnNames.size(); + } + + while(0<numRows--) { + Vector rowData=new Vector(); + rowData.setSize(numColumns); + data.add(rowData); + } + + setDataVector(data, columnNames); + } + + /** + * Creates a new table with the specified column names and row count. + * + * @param columnNames the column names. + * @param numRows the number of rows. + */ + public DefaultTableModel(Object[]columnNames,int numRows) { + this(convertToVector(columnNames), numRows); + } + + /** + * Creates a new table with the specified data values and column names. + * + * @param data the data values. + * @param columnNames the column names. + */ + public DefaultTableModel(Vector data,Vector columnNames) { + setDataVector(data, columnNames); + } + + /** + * Creates a new table with the specified data values and column names. + * + * @param data the data values. + * @param columnNames the column names. + */ + public DefaultTableModel(Object[][]data,Object[]columnNames) { + this(convertToVector(data), convertToVector(columnNames)); + } + + /** + * Returns the vector containing the row data for the table. + * + * @return The data vector. + */ + public Vector getDataVector() { + return dataVector; + } + + /** + * Sets the data and column identifiers for the table. The data vector + * contains a <code>Vector</code> for each row in the table - if the + * number of objects in each row does not match the number of column + * names specified, the row data is truncated or expanded (by adding + * <code>null</code> values) as required. + * + * @param data the data for the table (a vector of row vectors). + * @param columnNames the column names. + * + * @throws NullPointerException if either argument is <code>null</code>. + */ + public void setDataVector(Vector data,Vector columnNames) { + if(data==null) { + dataVector=new Vector(); + } else { + dataVector=data; + } + setColumnIdentifiers(columnNames); + } + + /** + * Sets the data and column identifiers for the table. + * + * @param data the data for the table. + * @param columnNames the column names. + * + * @throws NullPointerException if either argument is <code>null</code>. + */ + public void setDataVector(Object[][]data,Object[]columnNames) { + setDataVector(convertToVector(data), convertToVector(columnNames)); + } + + /** + * Sends the specified <code>event</code> to all registered listeners. + * This method is equivalent to + * {@link AbstractGWTTableModel#fireTableChanged(TableModelEvent)}. + * + * @param event the event. + */ + public void newDataAvailable(TableModelEvent event) { + fireTableChanged(event); + } + + /** + * Sends the specified <code>event</code> to all registered listeners. + * This method is equivalent to + * {@link AbstractGWTTableModel#fireTableChanged(TableModelEvent)}. + * + * @param event the event. + */ + public void newRowsAdded(TableModelEvent event) { + fireTableChanged(event); + } + + /** + * Sends the specified <code>event</code> to all registered listeners. + * This method is equivalent to + * {@link AbstractGWTTableModel#fireTableChanged(TableModelEvent)}. + * + * @param event the event. + */ + public void rowsRemoved(TableModelEvent event) { + fireTableChanged(event); + } + + /** + * Sets the column identifiers, updates the data rows (truncating + * or padding each row with <code>null</code> values) to match the + * number of columns, and sends a {@link TableModelEvent} to all + * registered listeners. + * + * @param columnIdentifiers the column identifiers. + */ + public void setColumnIdentifiers(Vector columnIdentifiers) { + this.columnIdentifiers=columnIdentifiers; + setColumnCount(columnIdentifiers == null ? 0 : columnIdentifiers.size()); + } + + /** + * Sets the column identifiers, updates the data rows (truncating + * or padding each row with <code>null</code> values) to match the + * number of columns, and sends a {@link TableModelEvent} to all + * registered listeners. + * + * @param columnIdentifiers the column identifiers. + */ + public void setColumnIdentifiers(Object[]columnIdentifiers) { + setColumnIdentifiers(convertToVector(columnIdentifiers)); + } + + /** + * This method is obsolete, use {@link #setRowCount(int)} instead. + * + * @param numRows the number of rows. + */ + public void setNumRows(int numRows) { + setRowCount(numRows); + } + + /** + * Sets the number of rows in the table. If <code>rowCount</code> is less + * than the current number of rows in the table, rows are discarded. + * If <code>rowCount</code> is greater than the current number of rows in + * the table, new (empty) rows are added. + * + * @param rowCount the row count. + */ + public void setRowCount(int rowCount) { + int existingRowCount=dataVector.size(); + + if(rowCount<existingRowCount) { + dataVector.setSize(rowCount); + fireTableRowsDeleted(rowCount,existingRowCount-1); + } else { + int rowsToAdd=rowCount-existingRowCount; + addExtraRows(rowsToAdd,columnIdentifiers.size()); + fireTableRowsInserted(existingRowCount,rowCount-1); + } + } + + /** + * Sets the number of columns in the table. Existing rows are truncated + * or padded with <code>null</code> values to match the new column count. + * A {@link TableModelEvent} is sent to all registered listeners. + * + * @param columnCount the column count. + */ + public void setColumnCount(int columnCount) { + for (Vector aDataVector : dataVector) { + aDataVector.setSize(columnCount); + } + + if(columnIdentifiers!=null) { + columnIdentifiers.setSize(columnCount); + } + fireTableStructureChanged(); + } + + /** + * Adds a column with the specified name to the table. All cell values + * for the column are initially set to <code>null</code>. + * + * @param columnName the column name (<code>null</code> permitted). + */ + public void addColumn(Object columnName) { + addColumn(columnName,(Object[])null); + } + + /** + * Adds a column with the specified name and data values to the table. + * + * @param columnName the column name (<code>null</code> permitted). + * @param columnData the column data. + */ + public void addColumn(Object columnName,Vector columnData) { + Object[]dataArray=null; + + if(columnData!=null) { + int rowCount=dataVector.size(); + + if(columnData.size()<rowCount) { + columnData.setSize(rowCount); + } + + dataArray=columnData.toArray(); + } + + addColumn(columnName,dataArray); + } + + /** + * Adds a column with the specified name and data values to the table. + * + * @param columnName the column name (<code>null</code> permitted). + * @param columnData the column data. + */ + public void addColumn(Object columnName,Object[]columnData) { + if(columnData!=null) { + // check columnData array for cases where the number of items + // doesn't match the number of rows in the existing table + if(columnData.length>dataVector.size()) { + int rowsToAdd=columnData.length-dataVector.size(); + addExtraRows(rowsToAdd,columnIdentifiers.size()); + } else if(columnData.length<dataVector.size()) { + Object[]tmp=new Object[dataVector.size()]; + System.arraycopy(columnData,0,tmp,0,columnData.length); + columnData=tmp; + } + } + + for(int i=0;i<dataVector.size();++i) { + dataVector.get(i).add(columnData == null ? null : columnData[i]); + } + + columnIdentifiers.add(columnName); + fireTableStructureChanged(); + } + + /** + * Adds a new row containing the specified data to the table and sends a + * {@link TableModelEvent} to all registered listeners. + * + * @param rowData the row data (<code>null</code> permitted). + */ + public void addRow(Vector rowData) { + int rowIndex = dataVector.size(); + dataVector.add(rowData); + newRowsAdded(new TableModelEvent(this,rowIndex,rowIndex,TableModelEvent.ALL_COLUMNS,TableModelEvent.INSERT)); + } + + /** + * Adds a new row containing the specified data to the table and sends a + * {@link TableModelEvent} to all registered listeners. + * + * @param rowData the row data (<code>null</code> permitted). + */ + public void addRow(Object[]rowData) { + addRow(convertToVector(rowData)); + } + + /** + * Inserts a new row into the table. + * + * @param row the row index. + * @param rowData the row data. + */ + public void insertRow(int row,Vector rowData) { + dataVector.add(row,rowData); + fireTableRowsInserted(row,row); + } + + /** + * Inserts a new row into the table. + * + * @param row the row index. + * @param rowData the row data. + */ + public void insertRow(int row,Object[]rowData) { + insertRow(row,convertToVector(rowData)); + } + + /** + * Moves the rows from <code>startIndex</code> to <code>endIndex</code> + * (inclusive) to the specified row. + * + * @param startIndex the start row. + * @param endIndex the end row. + * @param toIndex the row to move to. + */ + public void moveRow(int startIndex,int endIndex,int toIndex) { + Vector removed=new Vector(); + + for(int i=endIndex;i>=startIndex;i--) { + removed.add(this.dataVector.remove(i)); + } + + for(int i=0;i<=endIndex-startIndex;i++) { + dataVector.insertElementAt((Vector)removed.get(i),toIndex); + } + + int firstRow=Math.min(startIndex,toIndex); + int lastRow=Math.max(endIndex,toIndex+(endIndex-startIndex)); + fireTableRowsUpdated(firstRow,lastRow); + } + + /** + * Removes a row from the table and sends a {@link TableModelEvent} to + * all registered listeners. + * + * @param row the row index. + */ + public void removeRow(int row) { + dataVector.remove(row); + fireTableRowsDeleted(row,row); + } + + /** + * Returns the number of rows in the model. + * + * @return The row count. + */ + public int getRowCount() { + return dataVector.size(); + } + + /** + * Returns the number of columns in the model. + * + * @return The column count. + */ + public int getColumnCount() { + + if (columnIdentifiers == null){ + return 0; + } else { + return columnIdentifiers.size(); + } + } + + /** + * Get the name of the column. If the column has the column identifier set, + * the return value is the result of the .toString() method call on that + * identifier. If the identifier is not explicitly set, the returned value + * is calculated by {@link AbstractGWTTableModel#getColumnName(int)}. + * + * @param column the column index. + * + * @return The column name. + */ + public String getColumnName(int column) { + String result; + + if(columnIdentifiers==null) { + result=super.getColumnName(column); + } else if(column<getColumnCount()) { + checkSize(); + Object id=columnIdentifiers.get(column); + + if(id!=null) { + result=id.toString(); + } else { + result=super.getColumnName(column); + } + } else { + result=super.getColumnName(column); + } + + return result; + } + + /** + * Returns <code>true</code> if the specified cell can be modified, and + * <code>false</code> otherwise. For this implementation, the method + * always returns <code>true</code>. + * + * @param row the row index. + * @param column the column index. + * + * @return <code>true</code> in all cases. + */ + public boolean isCellEditable(int row,int column) { + return true; + } + + /** + * Returns the value at the specified cell in the table. + * + * @param row the row index. + * @param column the column index. + * + * @return The value (<code>Object</code>, possibly <code>null</code>) at + * the specified cell in the table. + */ + public Object getValueAt(int column, int row) { + if (row<dataVector.size()) { + Vector rowVector = dataVector.get(row); + if (column<rowVector.size()) { + return rowVector.get(column); + } else { + return null; + } + } else { + return null; + } + } + + /** + * Sets the value for the specified cell in the table and sends a + * {@link TableModelEvent} to all registered listeners. + * + * @param value the value (<code>Object</code>, <code>null</code> permitted). + * @param row the row index. + * @param column the column index. + */ + public void setValueAt(Object value,int row,int column) { + int size = dataVector.size(); + + if(row>=size){ + for (int i=size;i<=row;i++) { + addRow(new Object[getColumnCount()]); + } + } + Vector rawVector = dataVector.get(row); + rawVector.set(column,value); + fireTableCellUpdated(row,column); + } + + /** + * Converts the data array to a <code>Vector</code>. + * + * @param data the data array (<code>null</code> permitted). + * + * @return A vector (or <code>null</code> if the data array + * is <code>null</code>). + */ + protected static Vector convertToVector(Object[]data) { + if(data == null) { + return null; + } + Vector vector = new Vector(data.length); + vector.addAll(Arrays.asList(data)); + return vector; + } + + /** + * Converts the data array to a <code>Vector</code> of rows. + * + * @param data the data array (<code>null</code> permitted). + * + * @return A vector (or <code>null</code> if the data array + * is <code>null</code>. + */ + protected static Vector convertToVector(Object[][]data) { + if(data==null) { + return null; + } + + Vector vector=new Vector(data.length); + for (Object[] aData : data) { + vector.add(convertToVector(aData)); + } + + return vector; + } + + /** + * This method adds some rows to <code>dataVector</code>. + * + * @param rowsToAdd number of rows to add + * @param nbColumns size of the added rows + */ + protected void addExtraRows(int rowsToAdd,int nbColumns) { + for(int i=0;i<rowsToAdd;i++) { + Vector tmp=new Vector(); + tmp.setSize(columnIdentifiers.size()); + dataVector.add(tmp); + } + } + + /** + * Checks the real columns/rows sizes against the ones returned by + * <code>getColumnCount()</code> and <code>getRowCount()</code>. + * If the supposed one are bigger, then we grow <code>columIdentifiers</code> + * and <code>dataVector</code> to their expected size. + */ + protected void checkSize() { + int columnCount=getColumnCount(); + int rowCount=getRowCount(); + + if(columnCount>columnIdentifiers.size()) { + columnIdentifiers.setSize(columnCount); + } + + if(dataVector!=null&&rowCount>dataVector.size()) { + int rowsToAdd=rowCount-dataVector.size(); + addExtraRows(rowsToAdd,columnCount); + } + } +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/DefaultTableModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,120 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ + +package org.nuiton.web.gwt.table; + +import com.google.gwt.user.client.ui.FlexTable; +import com.google.gwt.user.client.ui.Widget; + +/** + * @author jcouteau + * @since 1.1 + */ +public class FlexTableWithModel extends FlexTable + implements TableModelListener { + + GWTTableModel model; + + public FlexTableWithModel() { + super(); + } + + public FlexTableWithModel(GWTTableModel model) { + super(); + setModel(model); + } + + public void setModel(GWTTableModel model) { + + removeAllRows(); + + if (this.model != null){ + this.model.removeTableModelListener(this); + } + this.model = model; + this.model.addTableModelListener(this); + } + + public GWTTableModel getModel(){ + return model; + } + + @Override + public void tableChanged(TableModelEvent event) { + + int firstColumn = event.getColumn(); + int lastColumn = event.getColumn(); + int type = event.getType(); + + + if (firstColumn == TableModelEvent.ALL_COLUMNS) { + firstColumn = 0; + lastColumn = getColumnCount() - 1; + } + + int firstRow = event.getFirstRow(); + int lastRow = event.getLastRow(); + + if (type == TableModelEvent.DELETE) { + for (int i = firstRow; i<=lastRow; i++) { + removeRow(i+1); + } + } else if (firstColumn == lastColumn) { + if (firstRow == lastRow) { + Object value = model.getValueAt(firstColumn, firstRow); + setValueAt(value, firstRow, firstColumn); + } else { + for (int j = firstRow; j <= lastRow; j++) { + Object value = model.getValueAt(firstColumn, j); + setValueAt(value, j, firstColumn); + } + } + } else { + for (int i=firstColumn; i<lastColumn; i++) { + + if (firstRow == lastRow) { + Object value = model.getValueAt(i, firstRow); + setValueAt(value,firstRow,i); + } else { + for (int j=firstRow; j<=lastRow; j++) { + Object value = model.getValueAt(i, j); + setValueAt(value,j,i); + } + } + } + } + } + + protected void setValueAt(Object value, int row, int col) { + if (value instanceof Widget) { + setWidget(row+1, col, (Widget) value); + } else if (value == null) { + setText(row+1, col, ""); + } else { + setText(row+1, col, value.toString()); + } + } + + protected int getColumnCount() { + return model.getColumnCount(); + } +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: 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 (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/GWTTableModel.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,49 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ + +package org.nuiton.web.gwt.table; + +/** + * @author jcouteau + * @since 1.1 + */ +public interface GWTTableModel { + + int getRowCount(); + + int getColumnCount(); + + String getColumnName(int col); + + Class<?> getColumnClass(int columnIndex); + + boolean isCellEditable(int col, int row); + + Object getValueAt(int col, int row); + + void setValueAt(Object value, int row, int col); + + void addTableModelListener(TableModelListener listener); + + void removeTableModelListener(TableModelListener listener); + +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/GWTTableModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,170 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ +package org.nuiton.web.gwt.table; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.FlexTable; +import com.google.gwt.user.client.ui.Widget; + +/** + * @author jcouteau + * @since 1.1 + */ +public class SortableFlexTableWithModel extends FlexTable + implements TableModelListener, ClickHandler { + + SortableTableModel model; + + public SortableFlexTableWithModel() { + super(); + this.addClickHandler(this); + } + + public SortableFlexTableWithModel(SortableTableModel model) { + this(); + setModel(model); + } + + public void setModel(SortableTableModel model) { + + removeAllRows(); + + if (this.model != null) { + this.model.removeTableModelListener(this); + } + this.model = model; + this.model.addTableModelListener(this); + } + + public SortableTableModel getModel() { + return model; + } + + @Override + public void tableChanged(TableModelEvent event) { + + int firstColumn = event.getColumn(); + int lastColumn = event.getColumn(); + int type = event.getType(); + + + if (firstColumn == TableModelEvent.ALL_COLUMNS) { + firstColumn = 0; + lastColumn = getColumnCount() - 1; + } + + int firstRow = event.getFirstRow(); + int lastRow = event.getLastRow(); + + if (type == TableModelEvent.DELETE) { + for (int i = firstRow; i <= lastRow; i++) { + removeRow(i + 1); + } + } else if (firstColumn == lastColumn) { + if (firstRow == lastRow) { + Object value = model.getValueAt(firstColumn, firstRow); + setValueAt(value, firstRow, firstColumn); + } else { + for (int j = firstRow; j <= lastRow; j++) { + Object value = model.getValueAt(firstColumn, j); + setValueAt(value, j, firstColumn); + } + } + } else { + for (int i = firstColumn; i < lastColumn; i++) { + + if (firstRow == lastRow) { + Object value = model.getValueAt(i, firstRow); + setValueAt(value, firstRow, i); + } else { + for (int j = firstRow; j <= lastRow; j++) { + if (j < model.getRowCount()) { + Object value = model.getValueAt(i, j); + setValueAt(value, j, i); + } else { + break; + } + } + } + } + } + } + + protected void setValueAt(Object value, int row, int col) { + if (value instanceof Widget) { + setWidget(row + 1, col, (Widget) value); + } else if (value == null) { + setText(row + 1, col, ""); + } else { + setText(row + 1, col, value.toString()); + } + } + + protected int getColumnCount() { + return model.getColumnCount(); + } + + @Override + public void onClick(ClickEvent event) { + int columnClicked = getCellForEvent(event).getCellIndex(); + int rowIndex = getCellForEvent(event).getRowIndex(); + + int sortedColumn = model.getSortedColumn(); + + int sortingOrder = model.getSortingOrder(); + + if (rowIndex == 0) { + if (sortedColumn == columnClicked) { + switch (sortingOrder) { + case SortableTableModel.ASC: + model.setSortedColumn(columnClicked, + SortableTableModel.DSC); + getCellFormatter().setStyleName(0,columnClicked,"sortedUp"); + break; + case SortableTableModel.DSC: + model.setSortedColumn(columnClicked, + SortableTableModel.ASC); + getCellFormatter().setStyleName(0,columnClicked,"sortedDown"); + break; + default: + model.setSortedColumn(columnClicked, + SortableTableModel.ASC); + getCellFormatter().setStyleName(0,columnClicked,"sortedDown"); + } + + } else { + model.setSortedColumn(columnClicked, SortableTableModel.ASC); + if (sortedColumn>=0) { + getCellFormatter().setStyleName(0,sortedColumn,"sortable"); + } + getCellFormatter().setStyleName(0,columnClicked,"sortedDown"); + } + } + } + + public void setColumnVisible(int col, boolean b) { + for (int i = 0; i < getRowCount(); i++) { + getCellFormatter().setVisible(i, col, b); + } + } +} \ No newline at end of file Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: 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 (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,163 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ +package org.nuiton.web.gwt.table; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * This class is used to provide sorting functionnalities when clicking on table + * columns. It is based on an underlying model that contains data. + * + * @author jcouteau + * @since 1.1 + */ +public class SortableTableModel extends AbstractGWTTableModel + implements Serializable , TableModelListener { + + protected GWTTableModel model; + + /** The sorted column, -1 means no sorting **/ + protected int sortedColumn = -1; + + /** The sorting order, -1 means no sorting **/ + protected int sortingOrder = -1; + + public final static int NO_SORTING = -1; + + public final static int ASC = 0; + + public final static int DSC = 1; + + protected int[] rowsOrder; + + public SortableTableModel(GWTTableModel model) { + super(); + this.model = model; + + //listen to the underlying model changes + model.addTableModelListener(this); + + initRowsOrder(); + } + + + @Override + public void tableChanged(TableModelEvent e) { + initRowsOrder(); + fireTableDataChanged(); + } + + @Override + public int getRowCount() { + return model.getRowCount(); + } + + @Override + public int getColumnCount() { + return model.getColumnCount(); + } + + @Override + public Object getValueAt(int col, int row) { + + int modelRow = rowsOrder[row]; + return model.getValueAt(col, modelRow); + } + + public void setSortedColumn(int column) { + setSortedColumn(column, ASC); + } + + public void setSortedColumn(int column, int order) { + int rowCount = model.getRowCount(); + + if (isSortable(column)) { + + sortedColumn = column; + sortingOrder = order; + + List originalColumn = new ArrayList(); + + for (int i=0; i<rowCount; i++) { + if (model.getValueAt(column,i) == null) { + return; + } + originalColumn.add(model.getValueAt(column, i)); + } + + List sortedColumn = new ArrayList(originalColumn); + + switch (order) { + case ASC : + Collections.sort(sortedColumn); + break; + case DSC : + Collections.sort(sortedColumn, Collections.reverseOrder()); + break; + default: + break; + } + + for (int i=0;i<rowCount; i++) { + Object value = sortedColumn.get(i); + int originalRow = originalColumn.indexOf(value); + originalColumn.set(originalRow,null); + rowsOrder[i] = originalRow; + } + + fireTableDataChanged(); + } + } + + public int getSortedColumn() { + return sortedColumn; + } + + public void setSortingOrder(int order) { + setSortedColumn(sortedColumn, order); + } + + public int getSortingOrder() { + return sortingOrder; + } + + protected boolean isSortable(int column) { + + try { + Comparable value = (Comparable)getValueAt(column, 0); + } catch (ClassCastException eee) { + return false; + } + return true; + } + + protected void initRowsOrder() { + int rowCount = model.getRowCount(); + rowsOrder = new int[rowCount]; + for (int i = 0;i<rowCount;i++) { + rowsOrder[i] = i; + } + } +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: 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 (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelEvent.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,102 @@ +/* + * Copyright 1997-2001 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the LICENSE file that accompanied this code. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * %%Ignore-License + */ + +package org.nuiton.web.gwt.table; + +import java.util.EventObject; + +/** + * + * Copy of javax.swing.event.TableModelEvent + * + * @author jcouteau + * @since 1.1 + */ +public class TableModelEvent extends EventObject { + + /** Identifies the addtion of new rows or columns. */ + public static final int INSERT = 1; + + /** Identifies a change to existing data. */ + public static final int UPDATE = 0; + + /** Identifies the removal of rows or columns. */ + public static final int DELETE = -1; + + /** Identifies the header row. */ + public static final int HEADER_ROW = -1; + + /** Specifies all columns in a row or rows. */ + public static final int ALL_COLUMNS = -1; + + + protected int column; + protected int firstRow; + protected int lastRow; + protected int type; + + public TableModelEvent(GWTTableModel source) { + this(source, 0, Integer.MAX_VALUE, ALL_COLUMNS, UPDATE); + } + + public TableModelEvent(GWTTableModel source, int row) { + this(source, row, row, ALL_COLUMNS, UPDATE); + } + + public TableModelEvent(GWTTableModel source, int firstRow, int lastRow) { + this(source, firstRow, lastRow, ALL_COLUMNS, UPDATE); + } + + public TableModelEvent(GWTTableModel source, int firstRow, int lastRow, int column) { + this(source, firstRow, lastRow, column, UPDATE); + } + + public TableModelEvent(GWTTableModel source, int firstRow, int lastRow, int column, int type) { + super(source); + this.firstRow = firstRow; + this.lastRow = lastRow; + this.column = column; + this.type = type; + } + + public int getColumn() { + return column; + } + + public int getFirstRow(){ + return firstRow; + } + + public int getLastRow(){ + return lastRow; + } + + public int getType() { + return type; + } + +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelEvent.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelListener.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelListener.java (rev 0) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelListener.java 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1,35 @@ +/* + * #%L + * Nuiton Web :: Nuiton GWT + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Jean Couteau + * %% + * 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% + */ + +package org.nuiton.web.gwt.table; + +import java.util.EventListener; + +/** + * @author jcouteau + * @since 1.1 + */ +public interface TableModelListener extends EventListener { + + void tableChanged(TableModelEvent e); + +} Property changes on: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties =================================================================== --- trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties (rev 0) +++ trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1 @@ +refcomp.loading=Loading, please wait Property changes on: trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties =================================================================== --- trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties (rev 0) +++ trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties 2011-03-09 11:01:10 UTC (rev 60) @@ -0,0 +1 @@ +refcomp.loading=Chargement, veuillez patienter Property changes on: trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r59 - trunk
by tchemit＠users.nuiton.org 16 Feb '11

16 Feb '11

Author: tchemit Date: 2011-02-16 22:27:55 +0100 (Wed, 16 Feb 2011) New Revision: 59 Url: http://nuiton.org/repositories/revision/nuiton-web/59 Log: Update mavenpom4redmineAndCentral to 2.5.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-10 12:15:14 UTC (rev 58) +++ trunk/pom.xml 2011-02-16 21:27:55 UTC (rev 59) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5</version> + <version>2.5.1</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r58 - trunk
by tchemit＠users.nuiton.org 10 Feb '11

10 Feb '11

Author: tchemit Date: 2011-02-10 13:15:14 +0100 (Thu, 10 Feb 2011) New Revision: 58 Url: http://nuiton.org/repositories/revision/nuiton-web/58 Log: Update mavenpom4redmineAndCentral to 2.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-09 08:21:23 UTC (rev 57) +++ trunk/pom.xml 2011-02-10 12:15:14 UTC (rev 58) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.4</version> + <version>2.5</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r57 - trunk
by tchemit＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: tchemit Date: 2011-02-09 09:21:23 +0100 (Wed, 09 Feb 2011) New Revision: 57 Url: http://nuiton.org/repositories/revision/nuiton-web/57 Log: Update mavenpom4redmineAndCentral to 2.4.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-27 11:06:30 UTC (rev 56) +++ trunk/pom.xml 2011-02-09 08:21:23 UTC (rev 57) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.3</version> + <version>2.4.4</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r56 - in trunk/src/site: . apt
by tchemit＠users.nuiton.org 27 Jan '11

27 Jan '11

Author: tchemit Date: 2011-01-27 12:06:30 +0100 (Thu, 27 Jan 2011) New Revision: 56 Url: http://nuiton.org/repositories/revision/nuiton-web/56 Log: Anomalie #1262: Fix site breadcrumbs url Anomalie #1263: No site_fr.xml on parent Added: trunk/src/site/apt/ trunk/src/site/apt/index.apt trunk/src/site/site_fr.xml Copied: trunk/src/site/apt/index.apt (from rev 55, trunk/nuiton-web/src/site/apt/index.apt) =================================================================== --- trunk/src/site/apt/index.apt (rev 0) +++ trunk/src/site/apt/index.apt 2011-01-27 11:06:30 UTC (rev 56) @@ -0,0 +1,34 @@ +~~~ +~~ #%L +~~ Nuiton Web :: Nuiton Web +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2011 CodeLutin +~~ %% +~~ 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% +~~~ + ---- + Nuiton Web + ---- + ---- + 2011-01-27 + ---- + +Présentation + + A faire... Property changes on: trunk/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml (rev 0) +++ trunk/src/site/site_fr.xml 2011-01-27 11:06:30 UTC (rev 56) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="images/logos/maven-feather.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="http://maven-site.nuiton.org/nuiton-web/index.html"/> + </breadcrumbs> + + <menu ref="modules"/> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r55 - trunk
by tchemit＠users.nuiton.org 27 Jan '11

27 Jan '11

Author: tchemit Date: 2011-01-27 09:55:27 +0100 (Thu, 27 Jan 2011) New Revision: 55 Url: http://nuiton.org/repositories/revision/nuiton-web/55 Log: Updates mavenpom to 2.4.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 18:56:28 UTC (rev 54) +++ trunk/pom.xml 2011-01-27 08:55:27 UTC (rev 55) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.2</version> + <version>2.4.3</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r54 - trunk
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 19:56:28 +0100 (Wed, 26 Jan 2011) New Revision: 54 Url: http://nuiton.org/repositories/revision/nuiton-web/54 Log: Anomalie #1255: Fix site deployement Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 16:19:23 UTC (rev 53) +++ trunk/pom.xml 2011-01-26 18:56:28 UTC (rev 54) @@ -166,6 +166,13 @@ </properties> + <distributionManagement> + <site> + <id>${site.server}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + <build> <pluginManagement>

1 0

r53 - in trunk: . nuiton-rss nuiton-tapestry nuiton-web
by hudson＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: hudson Date: 2011-01-26 17:19:23 +0100 (Wed, 26 Jan 2011) New Revision: 53 Url: http://nuiton.org/repositories/revision/nuiton-web/53 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-rss/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-01-26 16:19:22 UTC (rev 52) +++ trunk/nuiton-rss/pom.xml 2011-01-26 16:19:23 UTC (rev 53) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-01-26 16:19:22 UTC (rev 52) +++ trunk/nuiton-tapestry/pom.xml 2011-01-26 16:19:23 UTC (rev 53) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-01-26 16:19:22 UTC (rev 52) +++ trunk/nuiton-web/pom.xml 2011-01-26 16:19:23 UTC (rev 53) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 16:19:22 UTC (rev 52) +++ trunk/pom.xml 2011-01-26 16:19:23 UTC (rev 53) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -202,11 +202,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.0</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.0 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.0</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> </project>

1 0

r52 - tags
by hudson＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: hudson Date: 2011-01-26 17:19:22 +0100 (Wed, 26 Jan 2011) New Revision: 52 Url: http://nuiton.org/repositories/revision/nuiton-web/52 Log: [maven-release-plugin] copy for tag nuiton-web-1.0 Added: tags/nuiton-web-1.0/

1 0

r51 - in trunk: . nuiton-rss nuiton-tapestry nuiton-web
by hudson＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: hudson Date: 2011-01-26 17:19:20 +0100 (Wed, 26 Jan 2011) New Revision: 51 Url: http://nuiton.org/repositories/revision/nuiton-web/51 Log: [maven-release-plugin] prepare release nuiton-web-1.0 Modified: trunk/nuiton-rss/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-01-26 16:16:00 UTC (rev 50) +++ trunk/nuiton-rss/pom.xml 2011-01-26 16:19:20 UTC (rev 51) @@ -22,9 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-01-26 16:16:00 UTC (rev 50) +++ trunk/nuiton-tapestry/pom.xml 2011-01-26 16:19:20 UTC (rev 51) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-01-26 16:16:00 UTC (rev 50) +++ trunk/nuiton-web/pom.xml 2011-01-26 16:19:20 UTC (rev 51) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -13,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 16:16:00 UTC (rev 50) +++ trunk/pom.xml 2011-01-26 16:19:20 UTC (rev 51) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> <modules> <module>nuiton-web</module> @@ -204,11 +202,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.0</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.0 </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.0</url> </scm> </project>

1 0

r50 - trunk
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 17:16:00 +0100 (Wed, 26 Jan 2011) New Revision: 50 Url: http://nuiton.org/repositories/revision/nuiton-web/50 Log: This is a central-able project ;) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 16:08:25 UTC (rev 49) +++ trunk/pom.xml 2011-01-26 16:16:00 UTC (rev 50) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> + <artifactId>mavenpom4redmineAndCentral</artifactId> <version>2.4.2</version> </parent>

1 0

r49 - in trunk/nuiton-tapestry/src/main: java/org/nuiton/web/tapestry5/annotations java/org/nuiton/web/tapestry5/components java/org/nuiton/web/tapestry5/data java/org/nuiton/web/tapestry5/mixins java/org/nuiton/web/tapestry5/services resources/org/nuiton/web/tapestry5/components
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 17:08:25 +0100 (Wed, 26 Jan 2011) New Revision: 49 Url: http://nuiton.org/repositories/revision/nuiton-web/49 Log: finish work of others... Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/package-info.java trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/feedback.css Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.web.tapestry5.annotations; import java.lang.annotation.Documented; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ /* *##% * Pollen :: Pollen Web Interface * Copyright (C) 2009 - 2010 Code Lutin Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.web.tapestry5.data; import org.apache.commons.collections.CollectionUtils; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.web.tapestry5.mixins; import org.apache.tapestry5.BindingConstants; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ /** * *##% * Wao :: Web Interface Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.web.tapestry5.services; import org.apache.tapestry5.Link; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.web.tapestry5.services; import org.apache.tapestry5.Binding; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.web.tapestry5.services; import org.apache.tapestry5.Binding; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.web.tapestry5.services; import org.apache.tapestry5.ioc.Configuration; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.web.tapestry5.services; /** Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.web.tapestry5.services; import org.apache.tapestry5.ioc.internal.util.TapestryException; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/package-info.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/package-info.java 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/package-info.java 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ /** * This package contains extra services (or abstraction) for Tapestry * applications. Generally, these services need to be built in the Modified: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/feedback.css =================================================================== --- trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/feedback.css 2011-01-26 16:07:53 UTC (rev 48) +++ trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/feedback.css 2011-01-26 16:08:25 UTC (rev 49) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Tapestry + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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% + */ .fb-error { width: 400px;

1 0

r48 - in trunk: . nuiton-web nuiton-web/src nuiton-web/src/license nuiton-web/src/main nuiton-web/src/main/java nuiton-web/src/main/java/org nuiton-web/src/main/java/org/nuiton nuiton-web/src/main/java/org/nuiton/web nuiton-web/src/main/java/org/nuiton/web/war nuiton-web/src/site nuiton-web/src/site/apt nuiton-web/src/test
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 17:07:53 +0100 (Wed, 26 Jan 2011) New Revision: 48 Url: http://nuiton.org/repositories/revision/nuiton-web/48 Log: Evolution #1201: Introduce WinstoneLauncher and JettyLauncher Evolution #1251: Introduce nuiton-web module Added: trunk/nuiton-web/ trunk/nuiton-web/LICENSE.txt trunk/nuiton-web/README.txt trunk/nuiton-web/changelog.txt trunk/nuiton-web/pom.xml trunk/nuiton-web/src/ trunk/nuiton-web/src/license/ trunk/nuiton-web/src/license/THIRD-PARTY.properties trunk/nuiton-web/src/main/ trunk/nuiton-web/src/main/java/ trunk/nuiton-web/src/main/java/org/ trunk/nuiton-web/src/main/java/org/nuiton/ trunk/nuiton-web/src/main/java/org/nuiton/web/ trunk/nuiton-web/src/main/java/org/nuiton/web/war/ trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java trunk/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java trunk/nuiton-web/src/main/java/org/nuiton/web/war/package-info.java trunk/nuiton-web/src/main/resources/ trunk/nuiton-web/src/site/ trunk/nuiton-web/src/site/apt/ trunk/nuiton-web/src/site/apt/Warlauncher.apt trunk/nuiton-web/src/site/apt/index.apt trunk/nuiton-web/src/site/site_fr.xml trunk/nuiton-web/src/test/ trunk/nuiton-web/src/test/java/ trunk/nuiton-web/src/test/resources/ Modified: trunk/pom.xml Property changes on: trunk/nuiton-web ___________________________________________________________________ Added: svn:ignore + target *.log *.ipr *.iws *.iml .project .classpath .settings Added: trunk/nuiton-web/LICENSE.txt =================================================================== --- trunk/nuiton-web/LICENSE.txt (rev 0) +++ trunk/nuiton-web/LICENSE.txt 2011-01-26 16:07:53 UTC (rev 48) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: trunk/nuiton-web/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-web/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-web/changelog.txt =================================================================== --- trunk/nuiton-web/changelog.txt (rev 0) +++ trunk/nuiton-web/changelog.txt 2011-01-26 16:07:53 UTC (rev 48) @@ -0,0 +1,2 @@ +Please refer to the release note : + http://maven-site.nuiton.org/nuiton-rss/changes-report.html \ No newline at end of file Property changes on: trunk/nuiton-web/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml (rev 0) +++ trunk/nuiton-web/pom.xml 2011-01-26 16:07:53 UTC (rev 48) @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>nuiton-web</artifactId> + + <dependencies> + +  + + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-webapp</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + + +  +  +  + + <name>Nuiton Web :: Nuiton Web</name> + <description>Usefull classes for web developpement.</description> + <inceptionYear>2011</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <properties> + +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + + <build> + + </build> + +  +  +  + + <profiles> + +  + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + + </plugins> + + </build> + </profile> + + </profiles> + +</project> Property changes on: trunk/nuiton-web/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-web/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/nuiton-web/src/license/THIRD-PARTY.properties 2011-01-26 16:07:53 UTC (rev 48) @@ -0,0 +1,16 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache Software License - Version 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License - Version 1.0 +# - GNU Lesser General Public License version 2.1 +# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jan 26 16:55:58 CET 2011 +javax.servlet--servlet-api--2.5--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 Property changes on: trunk/nuiton-web/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java 2011-01-26 16:07:53 UTC (rev 48) @@ -0,0 +1,297 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * 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% + */ + +package org.nuiton.web.war; + +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; + +import javax.swing.ImageIcon; +import java.awt.AWTException; +import java.awt.Desktop; +import java.awt.Image; +import java.awt.MenuItem; +import java.awt.PopupMenu; +import java.awt.SystemTray; +import java.awt.TrayIcon; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringWriter; +import java.net.JarURLConnection; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; + +/** + * War main class launcher (jetty based). + * + * To use it : + * java -jar app-xxx.war + * + * @author chatellier + * @version $Id$ + * @since 1.0 + */ +public class JettyLauncher implements ActionListener, MouseListener { + + /** Jetty server instance. */ + protected Server jettyServer; + + /** Server URI. */ + protected URI serverUri; + + /** Default port. */ + protected int port = 8888; + + /** Server name. */ + protected String serverName; + + /** + * Main method (used by war in manifest). + * + * @param args args + * @throws Exception + */ + public static void main(String[] args) throws Exception { + JettyLauncher launcher = new JettyLauncher(); + launcher.readInformation(); + launcher.startServer(args); + launcher.installSystemTray(); + launcher.openBrowser(); + } + + /** + * Parse WEB-INF/web.xml file and get server display name. + * + * @since 1.1.3 + */ + protected void readInformation() { + InputStream stream = JettyLauncher.class.getResourceAsStream("/WEB-INF/web.xml"); + + if (stream != null) { + String content = readAsString(stream); + if (content != null) { + int first = content.indexOf("<display-name>"); + if (first >= 0) { + serverName = content.substring(first + 14, content.indexOf("</display-name>")); + System.out.println("Using server name : " + serverName); + } + } + } + + // if none read, set default + if (serverName == null || serverName.isEmpty()) { + serverName = "Server"; + } + } + + /** + * Read input stream as string. + * + * Code from commons io. + * + * @param stream stream to read + * @return content as string + * @since 1.1.3 + */ + protected String readAsString(InputStream stream) { + InputStreamReader reader = new InputStreamReader(stream); + StringWriter sw = new StringWriter(); + char[] buffer = new char[4096]; + int n = 0; + try { + while (-1 != (n = reader.read(buffer))) { + sw.write(buffer, 0, n); + } + } catch (IOException e) { + e.printStackTrace(); + } + return sw.toString(); + } + + /** + * Launch servlet container. + * + * @param args args + * @throws Exception + */ + protected void startServer(String[] args) throws Exception { + System.out.println("Starting server embedded mode..."); + + String fqnLauncherFile = JettyLauncher.class.getName().replaceAll("\\.", "/") + ".class"; + System.out.println("Search for launcher class : " + fqnLauncherFile); + + URL classFile = JettyLauncher.class.getClassLoader().getResource(fqnLauncherFile); + System.out.println(" - using classFile : " + classFile); + + // strange following line seams also work for jnlp launch + File me = new File(((JarURLConnection) classFile.openConnection()).getJarFile().getName()); + System.out.println(" - using warfile file : " + me); + + jettyServer = new Server(); + + Connector connector = new SelectChannelConnector(); + connector.setPort(port); + jettyServer.setConnectors(new Connector[]{connector}); + + WebAppContext webappcontext = new WebAppContext(); + webappcontext.setContextPath("/"); + webappcontext.setWar(me.getAbsolutePath()); + + HandlerCollection handlers= new HandlerCollection(); + handlers.setHandlers(new Handler[]{webappcontext, new DefaultHandler()}); + jettyServer.setHandler(handlers); + + jettyServer.start(); + + // build server uri + try { + serverUri = new URI("http://localhost:" + port); + } catch (URISyntaxException e) { + e.printStackTrace(); + } + } + + /** + * Shutdown server. + */ + protected void stopServer() { + if (jettyServer != null) { + try { + jettyServer.stop(); + } catch (Exception e) { + e.printStackTrace(); + } + System.exit(0); + } + } + + /** + * Install system tray to stop server. + */ + protected void installSystemTray() { + if (SystemTray.isSupported()) { + // build menu + PopupMenu menu = new PopupMenu(); + MenuItem browserItem = new MenuItem("Start browser"); + browserItem.addActionListener(this); + browserItem.setActionCommand("browser"); + menu.add(browserItem); + + MenuItem stopItem = new MenuItem("Stop server"); + stopItem.addActionListener(this); + stopItem.setActionCommand("stop"); + menu.add(stopItem); + + // build tray icon + URL imageURL = JettyLauncher.class.getResource("/favicon.png"); + if (imageURL == null) { + imageURL = JettyLauncher.class.getResource("/favicon.jpg"); + } + if (imageURL == null) { + System.out.println("No favicon.{png|jpg} found, skip systray installation"); + } else { + Image image = new ImageIcon(imageURL).getImage(); + TrayIcon icon = new TrayIcon(image, serverName, menu); + icon.setImageAutoSize(true); + icon.addMouseListener(this); + + // System tray + SystemTray systemTray = SystemTray.getSystemTray(); + try { + systemTray.add(icon); + } catch (AWTException ex) { + throw new RuntimeException("Can't install tray icon", ex); + } + } + } + } + + @Override + public void actionPerformed(ActionEvent e) { + if ("browser".equalsIgnoreCase(e.getActionCommand())) { + openBrowser(); + } else if ("stop".equalsIgnoreCase(e.getActionCommand())) { + stopServer(); + } + } + + /** + * Open browser. + * + * @throws IOException + */ + protected void openBrowser() { + if (Desktop.isDesktopSupported() && serverUri != null) { + Desktop desktop = Desktop.getDesktop(); + if (desktop.isSupported(Desktop.Action.BROWSE)) { + System.out.println("Opening browser at " + serverUri); + try { + desktop.browse(serverUri); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + openBrowser(); + } + } + + @Override + public void mousePressed(MouseEvent e) { + + } + + @Override + public void mouseReleased(MouseEvent e) { + + } + + @Override + public void mouseEntered(MouseEvent e) { + + } + + @Override + public void mouseExited(MouseEvent e) { + + } +} Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java 2011-01-26 16:07:53 UTC (rev 48) @@ -0,0 +1,294 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * 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% + */ +package org.nuiton.web.war; + +import winstone.Launcher; + +import javax.swing.ImageIcon; +import java.awt.AWTException; +import java.awt.Desktop; +import java.awt.Image; +import java.awt.MenuItem; +import java.awt.PopupMenu; +import java.awt.SystemTray; +import java.awt.TrayIcon; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringWriter; +import java.net.JarURLConnection; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Map; + +/** + * War main class launcher (winstone based). + * + * Based on winstone micro container. + * + * To use it : + * java -jar app-xxx.war + * + * @author chatellier + * @version $Id$ + * @since 1.0 + */ +public class WinstoneLauncher implements ActionListener, MouseListener { + + /** Winstone server instance. */ + protected Launcher winstone; + + /** Server URI. */ + protected URI serverUri; + + /** Server name. */ + protected String serverName; + + /** + * Main method (used by war in manifest). + * + * @param args args + * @throws IOException + */ + public static void main(String[] args) throws IOException { + WinstoneLauncher launcher = new WinstoneLauncher(); + launcher.readInformation(); + launcher.startServer(args); + launcher.installSystemTray(); + launcher.openBrowser(); + } + + /** + * Parse WEB-INF/web.xml file and get server display name. + * + * @since 1.1.3 + */ + protected void readInformation() { + InputStream stream = WinstoneLauncher.class.getResourceAsStream("/WEB-INF/web.xml"); + + if (stream != null) { + String content = readAsString(stream); + if (content != null) { + int first = content.indexOf("<display-name>"); + if (first >= 0) { + serverName = content.substring(first + 14, content.indexOf("</display-name>")); + System.out.println("Using server name : " + serverName); + } + } + } + + // if none read, set default + if (serverName == null || serverName.isEmpty()) { + serverName = "Server"; + } + } + + /** + * Read input stream as string. + * + * Code from commons io. + * + * @param stream stream to read + * @return content as string + * @since 1.1.3 + */ + protected String readAsString(InputStream stream) { + InputStreamReader reader = new InputStreamReader(stream); + StringWriter sw = new StringWriter(); + char[] buffer = new char[4096]; + int n = 0; + try { + while (-1 != (n = reader.read(buffer))) { + sw.write(buffer, 0, n); + } + } catch (IOException e) { + e.printStackTrace(); + } + return sw.toString(); + } + + /** + * Launch servlet container. + * + * @param args args + * @throws IOException + */ + protected void startServer(String[] args) throws IOException { + System.out.println("Starting server embedded mode..."); + + String fqnLauncherFile = WinstoneLauncher.class.getName().replaceAll("\\.", "/") + ".class"; + System.out.println("Search for launcher class : " + fqnLauncherFile); + + URL classFile = WinstoneLauncher.class.getClassLoader().getResource(fqnLauncherFile); + System.out.println(" - using classFile : " + classFile); + + // strange following line seams also work for jnlp launch + File me = new File(((JarURLConnection) classFile.openConnection()).getJarFile().getName()); + System.out.println(" - using warfile file : " + me); + + // hashArgs map, initialized with command line args + Map<String, String> hashArgs = Launcher.getArgsFromCommandLine(args); + + hashArgs.put("warfile", me.getAbsolutePath()); // or any other command line args, eg port + + System.out.println(" - using args : " + hashArgs); + + Launcher.initLogger(hashArgs); + winstone = new Launcher(hashArgs); // spawns threads, so your application doesn't block + + // open browser + int port = 8080; + String configPort = hashArgs.get("httpPort"); + if (configPort != null && !configPort.isEmpty()) { + try { + port = Integer.parseInt(configPort); + } catch (NumberFormatException e) { + e.printStackTrace(); + } + } + + // build server uri + try { + serverUri = new URI("http://localhost:" + port); + } catch (URISyntaxException e) { + e.printStackTrace(); + } + } + + /** + * Shutdown server. + */ + protected void stopServer() { + if (winstone != null) { + winstone.shutdown(); + System.exit(0); + } + } + + /** + * Install system tray to stop server. + */ + protected void installSystemTray() { + if (SystemTray.isSupported()) { + // build menu + PopupMenu menu = new PopupMenu(); + MenuItem browserItem = new MenuItem("Start browser"); + browserItem.addActionListener(this); + browserItem.setActionCommand("browser"); + menu.add(browserItem); + + MenuItem stopItem = new MenuItem("Stop server"); + stopItem.addActionListener(this); + stopItem.setActionCommand("stop"); + menu.add(stopItem); + + // build tray icon + URL imageURL = WinstoneLauncher.class.getResource("/favicon.png"); + if (imageURL == null) { + imageURL = WinstoneLauncher.class.getResource("/favicon.jpg"); + } + if (imageURL == null) { + System.out.println("No favicon.{png|jpg} found, skip systray installation"); + } else { + Image image = new ImageIcon(imageURL).getImage(); + TrayIcon icon = new TrayIcon(image, serverName, menu); + icon.setImageAutoSize(true); + icon.addMouseListener(this); + + // System tray + SystemTray systemTray = SystemTray.getSystemTray(); + try { + systemTray.add(icon); + } catch (AWTException ex) { + throw new RuntimeException("Can't install tray icon", ex); + } + } + } + } + + /* + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(ActionEvent e) { + if ("browser".equalsIgnoreCase(e.getActionCommand())) { + openBrowser(); + } else if ("stop".equalsIgnoreCase(e.getActionCommand())) { + stopServer(); + } + } + + /** + * Open browser. + * + * @throws IOException + */ + protected void openBrowser() { + if (Desktop.isDesktopSupported() && serverUri != null) { + Desktop desktop = Desktop.getDesktop(); + if (desktop.isSupported(Desktop.Action.BROWSE)) { + System.out.println("Opening browser at " + serverUri); + try { + desktop.browse(serverUri); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + openBrowser(); + } + } + + @Override + public void mousePressed(MouseEvent e) { + + } + + @Override + public void mouseReleased(MouseEvent e) { + + } + + @Override + public void mouseEntered(MouseEvent e) { + + } + + @Override + public void mouseExited(MouseEvent e) { + + } +} Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-web/src/main/java/org/nuiton/web/war/package-info.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/war/package-info.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/war/package-info.java 2011-01-26 16:07:53 UTC (rev 48) @@ -0,0 +1,34 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * 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% + */ +/** + * Embedded war launchers. + * + * Currently implemented with : + * <ul> + * <li>Winstone : {@link org.nuiton.web.war.WinstoneLauncher}</li> + * <li>Jetty : {@link org.nuiton.web.war.JettyLauncher}</li> + * </ul> + */ +package org.nuiton.web.war; Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/war/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-web/src/site/apt/Warlauncher.apt =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt (rev 0) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt 2011-01-26 16:07:53 UTC (rev 48) @@ -0,0 +1,174 @@ +~~~ +~~ #%L +~~ Nuiton Web :: Nuiton Web +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2011 CodeLutin +~~ %% +~~ 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% +~~~ + ------ + War launcher + ------ + + +War launcher + +* Features + + * Start embedded servlet container with current webapp + + * Favicon support + + * Systray with popup menu + +* Prerequisites + + By default, both jetty and winstone look for an icon named <<favicon.png>> or + <<favicon.jpg>> at webapp base. If none of this icons is found, system tray + won't work. + + In maven, by default, this file must be put in <<<src/main/webapp>>> directory. + + If <<<display-name>>> content can be read into <<<WEB-INF/web.xml>>> file, + it's used as server name (currently in systray tooltip). + +* Use Winstone war launcher + +** Maven configuration + + Add following dependencies to your project. + +------------------------------------------------ +<dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.3</version> + <scope>provided</scope> +</dependency> +<dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-16</version> + <scope>provided</scope> +</dependency> +------------------------------------------------ + + They have to be both at least in <<<provided>>> scope. + + Then, you need to add following configuration into maven-war-plugin : + +-------------------------------------------------------------------- +<plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> + <includes> + <include>**/war/Winstone*</include> + </includes> + </overlay> + <overlay> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> +</plugin> +-------------------------------------------------------------------- + +** References + + * Winstone home : {{http://winstone.sourceforge.net}} + + * Winstone command line options : {{http://winstone.sourceforge.net/#commandLine}} + +* Jetty based + +** Maven configuration + + Add following dependencies to your project. + +------------------------------------------------ +<dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.3</version> + <scope>provided</scope> +</dependency> +<dependency> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-webapp</artifactId> + <version>7.1.0.v20100505</version> + <scope>provided</scope> +</dependency> +<dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> +</dependency> +------------------------------------------------ + + They have to be both at least in <<<provided>>> scope. + + Then, you need to add following configuration into maven-war-plugin : + +-------------------------------------------------------------------- +<plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.util.war.JettyLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> + <includes> + <include>**/war/Jetty*</include> + </includes> + </overlay> + <overlay> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-webapp</artifactId> + <type>jar</type> + </overlay> + <overlay> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> +</plugin> +-------------------------------------------------------------------- Property changes on: trunk/nuiton-web/src/site/apt/Warlauncher.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-web/src/site/apt/index.apt =================================================================== --- trunk/nuiton-web/src/site/apt/index.apt (rev 0) +++ trunk/nuiton-web/src/site/apt/index.apt 2011-01-26 16:07:53 UTC (rev 48) @@ -0,0 +1,34 @@ +~~~ +~~ #%L +~~ Nuiton Web :: Nuiton Web +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2011 CodeLutin +~~ %% +~~ 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% +~~~ + ---- + Nuiton Web + ---- + ---- + 2009-08-23 + ---- + +Présentation + + A faire... Property changes on: trunk/nuiton-web/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-web/src/site/site_fr.xml =================================================================== --- trunk/nuiton-web/src/site/site_fr.xml (rev 0) +++ trunk/nuiton-web/src/site/site_fr.xml 2011-01-26 16:07:53 UTC (rev 48) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="War launcher" href="/Warlauncher.html"/> + </menu> + + <menu name="Téléchargement"> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/nuiton-web/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 15:30:14 UTC (rev 47) +++ trunk/pom.xml 2011-01-26 16:07:53 UTC (rev 48) @@ -20,6 +20,7 @@ <version>1.0-SNAPSHOT</version> <modules> + <module>nuiton-web</module> <module>nuiton-tapestry</module> <module>nuiton-rss</module> </modules> @@ -28,6 +29,20 @@ <dependencies> +  + + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-24</version> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-webapp</artifactId> + <version>7.1.0.v20100505</version> + </dependency> +  <dependency> <groupId>org.apache.tapestry</groupId>

1 0

r47 - in trunk: . nuiton-tapestry
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 16:30:14 +0100 (Wed, 26 Jan 2011) New Revision: 47 Url: http://nuiton.org/repositories/revision/nuiton-web/47 Log: clean poms Modified: trunk/nuiton-tapestry/pom.xml trunk/pom.xml Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-01-26 15:14:38 UTC (rev 46) +++ trunk/nuiton-tapestry/pom.xml 2011-01-26 15:30:14 UTC (rev 47) @@ -100,5 +100,4 @@ </plugins> </build> - </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 15:14:38 UTC (rev 46) +++ trunk/pom.xml 2011-01-26 15:30:14 UTC (rev 47) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4.1</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.web</groupId> @@ -190,7 +190,8 @@ <scm> <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm>

1 0

r46 - in trunk: nuiton-rss nuiton-rss/src/license nuiton-rss/src/main/java/org/nuiton/rss nuiton-rss/src/main/resources nuiton-rss/src/main/resources/fckeditor nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang nuiton-rss/src/main/webapp nuiton-rss/src/main/webapp/WEB-INF nuiton-rss/src/site nuiton-rss/src/site/apt nuiton-rss/src/test/java/org/nuiton/rss nuiton-rss/src/test/java/resources nuiton-tapest
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 16:14:38 +0100 (Wed, 26 Jan 2011) New Revision: 46 Url: http://nuiton.org/repositories/revision/nuiton-web/46 Log: optimize dependencies + add svn-keywords Added: trunk/nuiton-tapestry/src/license/ trunk/nuiton-tapestry/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-rss/LICENSE.txt trunk/nuiton-rss/README.txt trunk/nuiton-rss/changelog.txt trunk/nuiton-rss/pom.xml trunk/nuiton-rss/src/license/THIRD-PARTY.properties trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/button.rss.gif trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js trunk/nuiton-rss/src/main/resources/log4j.properties trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml trunk/nuiton-rss/src/main/webapp/feed.css trunk/nuiton-rss/src/main/webapp/feeds.txt trunk/nuiton-rss/src/main/webapp/index.html trunk/nuiton-rss/src/main/webapp/rssgenerator.js trunk/nuiton-rss/src/main/webapp/rssinclude.js trunk/nuiton-rss/src/main/webapp/testFck.html trunk/nuiton-rss/src/main/webapp/testGenerator.html trunk/nuiton-rss/src/main/webapp/testRender.html trunk/nuiton-rss/src/site/apt/index.apt trunk/nuiton-rss/src/site/site_fr.xml trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java trunk/nuiton-rss/src/test/java/resources/log4j.properties trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js Property changes on: trunk/nuiton-rss/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/pom.xml 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ <!-- #%L Nuiton Utils :: Nuiton RSS - $Id: pom.xml 2005 2010-12-30 12:14:03Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/pom.xml $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit %% Property changes on: trunk/nuiton-rss/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: BaseServlet.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: ConfigInitializer.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: FeedData.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: FeedEntryComparator.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: FeedHTMLRenderer.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: FeedRenderer.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: FeedRendererConfig.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: FeedType.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: FeedURLResolver.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: Field.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: HTMLCleaner.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: HTMLScriptCleaner.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: RSSConfig.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: RSSGenerator.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: RSSGeneratorConfig.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: RSSGeneratorServlet.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: RSSHelper.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: RSSIOUtil.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: RSSServlet.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: SimpleFeedURLResolver.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/button.rss.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ #%L Nuiton Utils :: Nuiton RSS - $Id: fck_rssinclude.html 2001 2010-12-30 11:25:14Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/resources/… $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/resources/log4j.properties =================================================================== --- trunk/nuiton-rss/src/main/resources/log4j.properties 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/resources/log4j.properties 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ # #%L # Nuiton Utils :: Nuiton RSS # -# $Id: log4j.properties 2001 2010-12-30 11:25:14Z tchemit $ -# $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/resources/… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin # %% Property changes on: trunk/nuiton-rss/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml 2011-01-26 15:14:38 UTC (rev 46) @@ -3,8 +3,8 @@ #%L Nuiton Utils :: Nuiton RSS - $Id: web.xml 2001 2010-12-30 11:25:14Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/webapp/WEB… $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% Property changes on: trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/webapp/feed.css =================================================================== --- trunk/nuiton-rss/src/main/webapp/feed.css 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/webapp/feed.css 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: feed.css 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/webapp/fee… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/nuiton-rss/src/main/webapp/feed.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/main/webapp/feeds.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/webapp/index.html =================================================================== --- trunk/nuiton-rss/src/main/webapp/index.html 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/webapp/index.html 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ #%L Nuiton Utils :: Nuiton RSS - $Id: index.html 2001 2010-12-30 11:25:14Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/webapp/ind… $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% Property changes on: trunk/nuiton-rss/src/main/webapp/index.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/main/webapp/rssgenerator.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-rss/src/main/webapp/rssinclude.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/webapp/testFck.html =================================================================== --- trunk/nuiton-rss/src/main/webapp/testFck.html 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/webapp/testFck.html 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ #%L Nuiton Utils :: Nuiton RSS - $Id: testFck.html 2001 2010-12-30 11:25:14Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/webapp/tes… $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% Property changes on: trunk/nuiton-rss/src/main/webapp/testFck.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/webapp/testGenerator.html =================================================================== --- trunk/nuiton-rss/src/main/webapp/testGenerator.html 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/webapp/testGenerator.html 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ #%L Nuiton Utils :: Nuiton RSS - $Id: testGenerator.html 2001 2010-12-30 11:25:14Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/webapp/tes… $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% Property changes on: trunk/nuiton-rss/src/main/webapp/testGenerator.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/main/webapp/testRender.html =================================================================== --- trunk/nuiton-rss/src/main/webapp/testRender.html 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/main/webapp/testRender.html 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ #%L Nuiton Utils :: Nuiton RSS - $Id: testRender.html 2001 2010-12-30 11:25:14Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/webapp/tes… $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% Property changes on: trunk/nuiton-rss/src/main/webapp/testRender.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/site/apt/index.apt =================================================================== --- trunk/nuiton-rss/src/site/apt/index.apt 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/site/apt/index.apt 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ ~~ #%L ~~ Nuiton Utils :: Nuiton RSS ~~ -~~ $Id: index.apt 2001 2010-12-30 11:25:14Z tchemit $ -~~ $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/site/apt/index.… $ +~~ $Id$ +~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin ~~ %% Property changes on: trunk/nuiton-rss/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/site/site_fr.xml =================================================================== --- trunk/nuiton-rss/src/site/site_fr.xml 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/site/site_fr.xml 2011-01-26 15:14:38 UTC (rev 46) @@ -3,8 +3,8 @@ #%L Nuiton Utils :: Nuiton RSS - $Id: site_fr.xml 2001 2010-12-30 11:25:14Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/site/site_fr.xml $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% Property changes on: trunk/nuiton-rss/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: RSSGeneratorHelperTest.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/test/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java =================================================================== --- trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils :: Nuiton RSS * - * $Id: RSSTest.java 2001 2010-12-30 11:25:14Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/test/java/org/n… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% Property changes on: trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-rss/src/test/java/resources/log4j.properties =================================================================== --- trunk/nuiton-rss/src/test/java/resources/log4j.properties 2011-01-09 19:28:52 UTC (rev 45) +++ trunk/nuiton-rss/src/test/java/resources/log4j.properties 2011-01-26 15:14:38 UTC (rev 46) @@ -2,8 +2,8 @@ # #%L # Nuiton Utils :: Nuiton RSS # -# $Id: log4j.properties 2001 2010-12-30 11:25:14Z tchemit $ -# $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/test/java/resou… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin # %% Property changes on: trunk/nuiton-rss/src/test/java/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-tapestry/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-tapestry/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/nuiton-tapestry/src/license/THIRD-PARTY.properties 2011-01-26 15:14:38 UTC (rev 46) @@ -0,0 +1,16 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache Software License 2.0 +# - BSD License +# - Common Public License Version 1.0 +# - LGPL 2.1 +# - MIT License +# - MPL 1.1 +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jan 26 16:04:35 CET 2011 +org.antlr--antlr-runtime--3.1.1--jar=BSD License Property changes on: trunk/nuiton-tapestry/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r45 - trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components
by bleny＠users.nuiton.org 09 Jan '11

09 Jan '11

Author: bleny Date: 2011-01-09 20:28:52 +0100 (Sun, 09 Jan 2011) New Revision: 45 Url: http://nuiton.org/repositories/revision/nuiton-web/45 Log: deprecate submitContext component (doesn't work with Tapestry 5.2) Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java 2011-01-07 12:59:52 UTC (rev 44) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java 2011-01-09 19:28:52 UTC (rev 45) @@ -43,9 +43,15 @@ * String context. The major difference between this component and Tapestry's * Submit component is that this component's context is immutable and can, for * example, be set to different values within a loop. + * + * @link http://wiki.apache.org/tapestry/Tapestry5SubmitContextComponent + * @deprecated was a monkey-patch for a Tapestry 5.0.4 issue. In Tapestry + * 5.2, the bug remains not solved but this workaround is broken. + * (your are f*cked). */ @SupportsInformalParameters @Events(EventConstants.SELECTED + " by default, may be overridden") +@Deprecated public final class SubmitContext implements ClientElement { /**

1 0

r44 - trunk
by fdesbois＠users.nuiton.org 07 Jan '11

07 Jan '11

Author: fdesbois Date: 2011-01-07 13:59:52 +0100 (Fri, 07 Jan 2011) New Revision: 44 Url: http://nuiton.org/repositories/revision/nuiton-web/44 Log: Useless version, nuiton-utils is not used Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-07 12:59:26 UTC (rev 43) +++ trunk/pom.xml 2011-01-07 12:59:52 UTC (rev 44) @@ -141,8 +141,6 @@  <projectId>nuiton-web</projectId> - <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> -  <tapestryVersion>5.2.4</tapestryVersion> <slf4jVersion>1.6.1</slf4jVersion>

1 0

r43 - in trunk: . nuiton-tapestry
by fdesbois＠users.nuiton.org 07 Jan '11

07 Jan '11

Author: fdesbois Date: 2011-01-07 13:59:26 +0100 (Fri, 07 Jan 2011) New Revision: 43 Url: http://nuiton.org/repositories/revision/nuiton-web/43 Log: Improve dependencies Modified: trunk/nuiton-tapestry/pom.xml trunk/pom.xml Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-01-07 12:39:32 UTC (rev 42) +++ trunk/nuiton-tapestry/pom.xml 2011-01-07 12:59:26 UTC (rev 43) @@ -25,8 +25,8 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> </dependency> <dependency> @@ -35,6 +35,16 @@ </dependency> <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + </dependency> + + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-07 12:39:32 UTC (rev 42) +++ trunk/pom.xml 2011-01-07 12:59:26 UTC (rev 43) @@ -28,13 +28,8 @@ <dependencies> +  <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> - - <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> <version>${tapestryVersion}</version> @@ -47,23 +42,18 @@ </dependency> <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>${jdomVersion}</version> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + <version>${tapestryVersion}</version> </dependency> <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>${romeVersion}</version> - <exclusions> - <exclusion> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + <version>${tapestryVersion}</version> </dependency> +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -76,10 +66,30 @@ <scope>runtime</scope> </dependency> +  <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> + + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>0.9</version> + <exclusions> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> + </exclusions> + </dependency> + +  + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>${servletVersion}</version> + <version>2.5</version> <scope>provided</scope> </dependency> @@ -137,12 +147,6 @@ <tapestryVersion>5.2.4</tapestryVersion> <slf4jVersion>1.6.1</slf4jVersion> -  - <romeVersion>0.9</romeVersion> - <jdomVersion>1.1</jdomVersion> - - <servletVersion>2.5</servletVersion> -  <siteLocales>en,fr</siteLocales>

1 0

r42 - in trunk/nuiton-tapestry/src/main: java/org/nuiton/web/tapestry5/annotations java/org/nuiton/web/tapestry5/components java/org/nuiton/web/tapestry5/data java/org/nuiton/web/tapestry5/services resources/org/nuiton/web/tapestry5/components
by fdesbois＠users.nuiton.org 07 Jan '11

07 Jan '11

Author: fdesbois Date: 2011-01-07 13:39:32 +0100 (Fri, 07 Jan 2011) New Revision: 42 Url: http://nuiton.org/repositories/revision/nuiton-web/42 Log: - clean headers - #1199 : remove subForm Removed: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java 2011-01-07 11:42:13 UTC (rev 41) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java 2011-01-07 12:39:32 UTC (rev 42) @@ -13,7 +13,7 @@ * Created: 3 mai 2010 * * @author fdesbois - * $Id$ + * @version $Id$ */ @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java 2011-01-07 11:42:13 UTC (rev 41) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java 2011-01-07 12:39:32 UTC (rev 42) @@ -49,6 +49,7 @@ * </pre> * * @author rannou + * @author fdesbois * @version $Id$ */ @IncludeStylesheet("feedback.css") Deleted: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java 2011-01-07 11:42:13 UTC (rev 41) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java 2011-01-07 12:39:32 UTC (rev 42) @@ -1,40 +0,0 @@ -package org.nuiton.web.tapestry5.components; - -import org.apache.tapestry5.Block; -import org.apache.tapestry5.annotations.Parameter; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.slf4j.Logger; - -/** - * Created: 14 mai 2010 - * - * @author fdesbois <fdesbois(a)codelutin.com> - * @version $Id: SubForm.java 3003 2010-05-19 18:25:58Z fdesbois $ - * @deprecated since 0.2, will be removed in next version. Useless since Select - * component could have zone in Tapestry 5.2 - */ -@Deprecated -public class SubForm { - - @Parameter - private boolean visible; - - @Inject - private Logger logger; - - @Inject - private Block formBlock; - - @Inject - private Block noFormBlock; - - public Block getActiveBlock() { - if (logger.isDebugEnabled()) { - logger.debug("form already visible : " + visible); - } - if (visible) { - return formBlock; - } - return noFormBlock; - } -} \ No newline at end of file Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java 2011-01-07 11:42:13 UTC (rev 41) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java 2011-01-07 12:39:32 UTC (rev 42) @@ -22,6 +22,7 @@ * @param <K> Type of the map key * @param <E> Type of the map value * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ */ public abstract class AbstractMappedGridDataSource<K, E> implements GridDataSource { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java 2011-01-07 11:42:13 UTC (rev 41) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java 2011-01-07 12:39:32 UTC (rev 42) @@ -23,7 +23,7 @@ * @param <U> type of User * @param <A> type of Annotation that manage authentication on pages/components * @author fdesbois - * $Id$ + * @version $Id$ */ public abstract class AbstractAuthenticationFilter<U, A extends Annotation> implements ComponentRequestFilter { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java 2011-01-07 11:42:13 UTC (rev 41) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java 2011-01-07 12:39:32 UTC (rev 42) @@ -18,7 +18,7 @@ * Created: 27 avr. 2010 * * @author fdesbois - * $Id$ + * @version $Id$ * @see FormatBindingFactory */ public class FormatBinding extends AbstractBinding { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java 2011-01-07 11:42:13 UTC (rev 41) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java 2011-01-07 12:39:32 UTC (rev 42) @@ -26,7 +26,7 @@ * Created: 27 avr. 2010 * * @author fdesbois - * $Id$ + * @version $Id$ */ public class FormatBindingFactory implements BindingFactory { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java 2011-01-07 11:42:13 UTC (rev 41) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java 2011-01-07 12:39:32 UTC (rev 42) @@ -12,7 +12,7 @@ * Created: 4 mai 2010 * * @author fdesbois - * $Id$ + * @version $Id$ */ public class NuitonModule { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java 2011-01-07 11:42:13 UTC (rev 41) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java 2011-01-07 12:39:32 UTC (rev 42) @@ -47,7 +47,7 @@ * * @param <U> user type * @author fdesbois - * $Id$ + * @version $Id$ */ public interface ServiceAuthentication<U> { Deleted: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml =================================================================== --- trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml 2011-01-07 11:42:13 UTC (rev 41) +++ trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml 2011-01-07 12:39:32 UTC (rev 42) @@ -1,16 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" - xmlns:p="tapestry:parameter"> - -<t:delegate t:to="activeBlock"/> -<t:block t:id="formBlock"> - <form t:type="form" action="tapestry"> - <t:body/> - </form> -</t:block> -<t:block t:id="noFormBlock"> - <t:body/> -</t:block> - -</html> \ No newline at end of file

1 0

r41 - in trunk: . nuiton-rss nuiton-rss/src nuiton-rss/src/license nuiton-rss/src/main nuiton-rss/src/main/java nuiton-rss/src/main/java/org nuiton-rss/src/main/java/org/nuiton nuiton-rss/src/main/java/org/nuiton/rss nuiton-rss/src/main/resources nuiton-rss/src/main/resources/fckeditor nuiton-rss/src/main/resources/fckeditor/editor nuiton-rss/src/main/resources/fckeditor/editor/plugins nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude nuiton-rss/src/main/resources/fckedi
by fdesbois＠users.nuiton.org 07 Jan '11

07 Jan '11

Author: fdesbois Date: 2011-01-07 12:42:13 +0100 (Fri, 07 Jan 2011) New Revision: 41 Url: http://nuiton.org/repositories/revision/nuiton-web/41 Log: #1189 : introduce nuiton-rss Added: trunk/nuiton-rss/ trunk/nuiton-rss/LICENSE.txt trunk/nuiton-rss/README.txt trunk/nuiton-rss/changelog.txt trunk/nuiton-rss/pom.xml trunk/nuiton-rss/src/ trunk/nuiton-rss/src/license/ trunk/nuiton-rss/src/license/THIRD-PARTY.properties trunk/nuiton-rss/src/main/ trunk/nuiton-rss/src/main/java/ trunk/nuiton-rss/src/main/java/org/ trunk/nuiton-rss/src/main/java/org/nuiton/ trunk/nuiton-rss/src/main/java/org/nuiton/rss/ trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java trunk/nuiton-rss/src/main/resources/ trunk/nuiton-rss/src/main/resources/fckeditor/ trunk/nuiton-rss/src/main/resources/fckeditor/editor/ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/button.rss.gif trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js trunk/nuiton-rss/src/main/resources/log4j.properties trunk/nuiton-rss/src/main/webapp/ trunk/nuiton-rss/src/main/webapp/WEB-INF/ trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml trunk/nuiton-rss/src/main/webapp/feed.css trunk/nuiton-rss/src/main/webapp/feeds.txt trunk/nuiton-rss/src/main/webapp/index.html trunk/nuiton-rss/src/main/webapp/rssgenerator.js trunk/nuiton-rss/src/main/webapp/rssinclude.js trunk/nuiton-rss/src/main/webapp/testFck.html trunk/nuiton-rss/src/main/webapp/testGenerator.html trunk/nuiton-rss/src/main/webapp/testRender.html trunk/nuiton-rss/src/site/ trunk/nuiton-rss/src/site/apt/ trunk/nuiton-rss/src/site/apt/index.apt trunk/nuiton-rss/src/site/site_fr.xml trunk/nuiton-rss/src/test/ trunk/nuiton-rss/src/test/java/ trunk/nuiton-rss/src/test/java/org/ trunk/nuiton-rss/src/test/java/org/nuiton/ trunk/nuiton-rss/src/test/java/org/nuiton/rss/ trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java trunk/nuiton-rss/src/test/java/resources/ trunk/nuiton-rss/src/test/java/resources/log4j.properties Modified: trunk/ trunk/changelog.txt trunk/nuiton-tapestry/changelog.txt trunk/nuiton-tapestry/pom.xml trunk/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml .project .classpath + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-07 11:05:53 UTC (rev 40) +++ trunk/changelog.txt 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,2 @@ +Please refer to the release note : + http://maven-site.nuiton.org/nuiton-web/changes-report.html \ No newline at end of file Property changes on: trunk/nuiton-rss ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: trunk/nuiton-rss/LICENSE.txt =================================================================== --- trunk/nuiton-rss/LICENSE.txt (rev 0) +++ trunk/nuiton-rss/LICENSE.txt 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/nuiton-rss/changelog.txt =================================================================== --- trunk/nuiton-rss/changelog.txt (rev 0) +++ trunk/nuiton-rss/changelog.txt 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,2 @@ +Please refer to the release note : + http://maven-site.nuiton.org/nuiton-rss/changes-report.html \ No newline at end of file Added: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml (rev 0) +++ trunk/nuiton-rss/pom.xml 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,223 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>nuiton-rss</artifactId> + + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + </dependency> + + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + +  +  +  + + <name>Nuiton Web :: Nuiton RSS</name> + <description>Servlet pouvant etre appeler depuis du JS pour recuperer un + flux RSS + </description> + <inceptionYear>2008</inceptionYear> + +  +  +  + + <packaging>war</packaging> + + <properties> + +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </plugin> + + </plugins> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>target/nuitonrss</webappDirectory> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + + </plugins> + + </pluginManagement> + </build> + +  +  +  + + <profiles> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <quiet>true</quiet> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + </links> + </configuration> + </plugin> + </plugins> + </reporting> + + </profile> + +  + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + + </plugins> + + </build> + </profile> + + </profiles> + +</project> Added: trunk/nuiton-rss/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-rss/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,13 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - Common Public License Version 1.0 +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Dec 30 12:16:27 CET 2010 +javax.servlet--servlet-api--2.5--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +org.jdom--jdom--1.1--jar=Apache Software License Like Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,145 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: BaseServlet.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * <p/> + * Servlet de base + * + * @param <D> la classe de l'object de delegation + * @author chemit + */ +public abstract class BaseServlet<D> extends HttpServlet { + + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ + protected static final Log log = LogFactory.getLog(BaseServlet.class); + /** + * L'objet de delegation du metier de la servlet + */ + protected transient D delegate; + private static final long serialVersionUID = 1L; + + /** + * @return the new delegate object to be used by servlet + * @throws Exception if any problem while instanciation + */ + protected abstract D newDelegate() throws Exception; + + /** + * @return a new ConfigInitializer to be used in + * {@link #init(ServletConfig, boolean)} method to prepare + * default config. + */ + protected abstract ConfigInitializer<ServletConfig, ?> newConfigInitializer(); + + /** + * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. + * + * @param request servlet request + * @param response servlet response + * @throws IOException TODO + * @throws ServletException TODO + */ + protected abstract void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException; + + @Override + public void init(ServletConfig config) throws ServletException { + init(config, true); + } + + protected void init(ServletConfig config, boolean initConfig) throws ServletException { + try { + super.init(config); + if (initConfig) { + // init de la configuration par defaut depuis la config de servlet + newConfigInitializer().init(config); + } + // instanciate delegate + delegate = newDelegate(); + } catch (Exception eee) { + log.warn("Can't configure Servlet", eee); + if (eee instanceof ServletException) { + throw (ServletException) eee; + } + throw new ServletException("Can't configure Servlet", eee); + } + } + + protected Integer convertToInt(String parameter) { + Integer result = null; + try { + result = Integer.parseInt(parameter); + } catch (Exception eee) { + log.debug("Can't convert to int: '" + parameter + "'", eee); + } + return result; + } + // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code."> + + /** + * Handles the HTTP <code>GET</code> method. + * + * @param request servlet request + * @param response servlet response + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } + + /** + * Handles the HTTP <code>POST</code> method. + * + * @param request servlet request + * @param response servlet response + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } + + /** + * Returns a short description of the servlet. + */ + @Override + public String getServletInfo() { + return "RSS Servlet"; + } + // </editor-fold> +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,80 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: ConfigInitializer.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import org.apache.commons.beanutils.BeanUtils; + +/** + * @param <S> la classe source de la configuration + * @param <D> la classe destination de la configuration + * @author tony + */ +public abstract class ConfigInitializer<S, D> { + + + /** + * @param config l'object source contenant les configs + * @param fullConfigName le nom complet de la propriete recherchee + * @return la valeur de la propriete ou null si non trouve + */ + protected abstract String getConfigValue(S config, String fullConfigName); + + public abstract void init(S config); + + /** + * Initialise RSSConfig. + * + * @param prefix + * @param klass la class de la configuration de destination + * @param config la configuration source + * @param keys + */ + public void init(String prefix, Class<D> klass, S config, String... keys) { + try { + String prefixConfig = getConfigValue(config, prefix); + prefixConfig = prefixConfig == null ? "" : prefixConfig.trim(); + + D instance = klass.newInstance(); + for (String key : keys) { + loadConfig(config, instance, prefixConfig, key); + } + } catch (InstantiationException ex) { + throw new RuntimeException(ex); + } catch (IllegalAccessException ex) { + throw new RuntimeException(ex); + } + } + + protected void loadConfig(S config, D instance, String prefix, String configName) { + String value = getConfigValue(config, prefix + configName); + if (value != null && !"".equals(value)) { + try { + BeanUtils.setProperty(instance, configName, value); + } catch (Exception ex) { + throw new IllegalStateException("could not load property " + configName + " from config " + config + " for reason : " + ex.getMessage()); + } + } + } +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,128 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: FeedData.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import com.sun.syndication.feed.synd.SyndFeed; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.net.URL; + +/** + * <p> + * Represente une URL demandee. Cette objet est conserve durant le temps de vie + * de la JVM pour permettre de mutualiser la recuperation et la transformation en + * HTML. + * </p> + * <p> + * Lorsque l'on demande le HTML et que l'url n'a pas encore ete recuperee ou + * est trop ancienne alors on lance la recuperation. Si deux threads demandent + * la recuperation, le deuxieme est mis en attente et profitera de la recuperation + * de l'autre. + * </p> + * + * @author poussin + */ +public class FeedData { + + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ + private static final Log log = LogFactory.getLog(FeedData.class); + + /** + * url du feed + */ + protected URL url; + /** + * les champs que l'on souhaite visualiser pour le feed + */ + protected FeedRendererConfig rendererConfig; + /** + * Le nombre d'item que l'on souhaite visualiser pour le feed + */ + protected int nbItem = -1; + + protected SyndFeed feed; + protected long lastRetrived; + + public FeedData(URL url, int nbItem, String representation) { + this(url); + this.nbItem = nbItem; + rendererConfig = new FeedRendererConfig(representation); + } + + public FeedData(URL url) { + this.url = url; + } + + public long getLastRetrived() { + return lastRetrived; + } + + public URL getUrl() { + return url; + } + + public FeedRendererConfig getRendererConfig() { + return rendererConfig; + } + + public void setRendererConfig(FeedRendererConfig rendererConfig) { + this.rendererConfig = rendererConfig; + } + + public int getNbItem() { + return nbItem; + } + + public void setNbItem(int nbItem) { + this.nbItem = nbItem; + } + + /** + * Retourne la representation HTML du RSS + * + * @return la representation HTML du RSS + */ + public SyndFeed getFeed() { + if (feed == null || lastRetrived + RSSConfig.TIME_FORCE_RETRIEVED < System.currentTimeMillis()) { + forceRetrived(); + } + + return feed; + } + + synchronized protected void forceRetrived() { + if (lastRetrived + RSSConfig.TIME_FORCE_RETRIEVED < System.currentTimeMillis()) { + try { + feed = RSSIOUtil.readFeed(url); + lastRetrived = System.currentTimeMillis(); + } catch (Exception eee) { + log.warn("Can't get feed: " + url, eee); + } + } + } +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,42 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: FeedEntryComparator.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import com.sun.syndication.feed.synd.SyndEntry; + +import java.util.Comparator; + +/** + * Comparator of entry base on his publication date + * + * @author tony + */ +public class FeedEntryComparator implements Comparator<SyndEntry> { + + public int compare(SyndEntry o1, SyndEntry o2) { + return o1.getPublishedDate().compareTo(o2.getPublishedDate()); + } + +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,240 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: FeedHTMLRenderer.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import com.sun.syndication.feed.synd.SyndEntry; +import com.sun.syndication.feed.synd.SyndFeed; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Arrays; +import java.util.EnumMap; +import java.util.HashSet; +import java.util.Set; + +/** + * @author poussin + */ +public class FeedHTMLRenderer implements FeedRenderer { + + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ + private static final Log log = LogFactory.getLog(FeedHTMLRenderer.class); + + private static final String FEED_CSS_PREFIX = "feed-"; + private static final String FEED_ITEM_CSS_PREFIX = "feedItem-"; + + /** + * tous les HTMLCleaner a utiliser pour nettoyer les chaines + */ + protected Set<HTMLCleaner> cleaners = new HashSet<HTMLCleaner>(); + + protected EnumMap<Field, String> templates = new EnumMap<Field, String>(Field.class); + protected EnumMap<Field, String> classnames = new EnumMap<Field, String>(Field.class); + protected EnumMap<Field, String> feedProperties = new EnumMap<Field, String>(Field.class); + protected EnumMap<Field, String> itemProperties = new EnumMap<Field, String>(Field.class); + + /** + * @param cleaners La liste des cleaners a utiliser par defaut. Si aucun + * cleaner n'est passer en argument HTMLScriptCleaner est automatiquement + * ajoute + */ + public FeedHTMLRenderer(HTMLCleaner... cleaners) { + if (cleaners.length == 0) { + addHTMLCleaner(new HTMLScriptCleaner()); + } + for (HTMLCleaner cleaner : cleaners) { + addHTMLCleaner(cleaner); + } + + templates.put(Field.NAME, "<span class=\"%1$s\">%2$s</span>\n"); + templates.put(Field.LINK, "<a class=\"%1$s\" href=\"%2$s\">%3$s</a>"); + templates.put(Field.IMAGE, "<span class=\"%1$s\"><img src=\"%2$s\"/></span>\n"); + templates.put(Field.DESCRIPTION, "<span class=\"%1$s\">%2$s</span>\n"); + templates.put(Field.AUTHOR, "<span class=\"%1$s\">%2$s</span>\n"); + //Probleme de conversion FIXME + templates.put(Field.TIME, "<span class=\"%1$s\">%2$s</span>\n"); + //templates.put(Field.TIME, "<span class=\"%1$s\">%2$tF</span>\n"); + + classnames.put(Field.NAME, "name"); + classnames.put(Field.LINK, "link"); + classnames.put(Field.IMAGE, "image"); + classnames.put(Field.DESCRIPTION, "description"); + classnames.put(Field.AUTHOR, "author"); + classnames.put(Field.TIME, "time"); + + feedProperties.put(Field.NAME, "title"); + feedProperties.put(Field.LINK, "link"); + // cela engendre des NPE... + feedProperties.put(Field.IMAGE, "image.url"); + feedProperties.put(Field.DESCRIPTION, "description"); + feedProperties.put(Field.AUTHOR, "author"); + feedProperties.put(Field.TIME, "publishedDate"); + + itemProperties.put(Field.NAME, "title"); + itemProperties.put(Field.LINK, "link"); + itemProperties.put(Field.IMAGE, null); + itemProperties.put(Field.DESCRIPTION, "description.value"); + itemProperties.put(Field.AUTHOR, "author"); + itemProperties.put(Field.TIME, "publishedDate"); + } + + + public FeedHTMLRenderer() { + this(new HTMLCleaner[0]); + } + + /** + * Supprime tous les cleaners de code html + */ + public void clearCleaners() { + cleaners.clear(); + } + + /** + * Ajoute un nouveau cleaner de code HTML + * + * @param cleaner cleaner to add + */ + public void addHTMLCleaner(HTMLCleaner cleaner) { + cleaners.add(cleaner); + } + + public String render(FeedRendererConfig config, SyndFeed feed, SyndEntry[] items) { + + StringBuffer sbGlobal = new StringBuffer(); + + StringBuffer sbTemp = new StringBuffer(); + for (Field f : config.getFeedFieldOrder()) { + renderField(f, FEED_CSS_PREFIX, feedProperties, feed, sbTemp); + } + + String tmp = sbTemp.toString(); + if (!"".equals(tmp)) { + sbGlobal.append("<div class='rss-feed'>\n").append(tmp).append("</div>\n"); + } + sbGlobal.append("<ul class='rss-items'>\n"); + sbTemp = new StringBuffer(); + for (SyndEntry item : items) { + sbTemp.append("<li>\n"); + for (Field f : config.getItemFieldOrder()) { + renderField(f, FEED_ITEM_CSS_PREFIX, itemProperties, item, sbTemp); + } + sbTemp.append("</li>\n"); + } + sbGlobal.append(sbTemp.toString()).append("</ul>\n"); + + return sbGlobal.toString(); + } + + protected void renderField(Field f, String cssPrefix, EnumMap<Field, String> properties, Object src, StringBuffer buffer) { + + if (f == Field.LINK) { + // do nothing, link should not be called alone but inside name field only + return; + } + String template = templates.get(f); + String classname = cssPrefix + classnames.get(f); + String prop = properties.get(f); + + if ("".equals(prop)) { + return; + } + + String result; + Object value = null; + try { + + value = BeanUtils.getProperty(src, prop); + if (f == Field.NAME) { + //special case, we must first render link + String templateLink = templates.get(Field.LINK); + String classnameLink = "feed-" + classnames.get(Field.LINK); + String propLink = properties.get(Field.LINK); + Object value2 = BeanUtils.getProperty(src, propLink); + value = render(templateLink, classnameLink, value2, value); + } + + result = render(template, classname, value); + + if (result != null && buffer != null) { + buffer.append(result); + } + } catch (Exception eee) { + log.warn("Can't get feed property value for property " + prop + ", value:" + value); + } + + } + + /** + * Permet de rendre un element du feed + * + * @param template le template pour rendre l'element + * @param classname la class de l'element html (pour une utilisation CSS) + * @param value la valeur de l'element + * @return le code HTML + */ + protected String render(String template, String classname, Object value) { + StringBuffer sb = new StringBuffer(); + if (value != null && !"".equals(value)) { + if (value instanceof String) { + // si value est une chaine, on la nettoie avec les cleaners enregistrer + for (HTMLCleaner cleaner : cleaners) { + value = cleaner.clean((String) value); + } + } + sb.append(renderTemplate(template, classname, value)); + } + return sb.toString(); + } + + protected String render(String template, String classname, Object value, Object value2) { + StringBuffer sb = new StringBuffer(); + if (value != null && !"".equals(value)) { + if (value instanceof String) { + // si value est une chaine, on la nettoie avec les cleaners enregistrer + for (HTMLCleaner cleaner : cleaners) { + value = cleaner.clean((String) value); + } + } + sb.append(renderTemplate(template, classname, value, value2)); + } + return sb.toString(); + } + + protected String renderTemplate(String template, Object... args) { + try { + String result; + result = String.format(template, args); + return result; + } catch (Exception e) { + log.warn("could not format template " + template + " with args : " + Arrays.toString(args)); + return ""; + } + } + +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,44 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: FeedRenderer.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import com.sun.syndication.feed.synd.SyndEntry; +import com.sun.syndication.feed.synd.SyndFeed; + +/** + * @author poussin + */ +public interface FeedRenderer { + + /** + * Retourne une chaine qui est la representation du feed et de ces items + * + * @param config la configuration a utiliser pour rendre le feed + * @param feed le feed a representer + * @param items la liste des items du feed a prendre en compte + * @return la representation souhaitee + */ + String render(FeedRendererConfig config, SyndFeed feed, SyndEntry[] items); +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,120 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: FeedRendererConfig.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import java.util.ArrayList; +import java.util.List; + +/** + * <p> + * Permet de spcecifier les champs a rendre, cet objet peut etre converti + * en une representation chaine pour etre facilement transportable. + * </p> + * <p> + * Exemple de representation texte: ndat-ndat. Le premier block represente le + * feed le second les items. S'il n'y a qu'un block cela veut dire qu'il ne + * faut pas reprensenter le feed mais seulement les items. L'ordre des lettres + * determine l'ordre du rendu. + * <li>n: name pour demander le nom ou titre du feed ou de l'item + * <li>i: image + * <li>d: description + * <li>a: author + * <li>t: time pour demander la date du feed ou de l'item + * </p> + * + * @author poussin + */ +public class FeedRendererConfig { + + protected String feedString = "indat"; + protected List<Field> feedList; + protected String itemString = "indat"; + protected List<Field> itemList; + + public FeedRendererConfig() { + } + + public FeedRendererConfig(String representation) { + setString(representation); + } + + protected List<Field> createList(String value) { + List<Field> result = new ArrayList<Field>(); + for (char c : value.toCharArray()) { + Field field = Field.valueOf(c); + if (field != null) { + result.add(field); + } + } + return result; + } + + public List<Field> getFeedFieldOrder() { + if (feedList == null) { + feedList = createList(feedString); + } + return feedList; + } + + public List<Field> getItemFieldOrder() { + if (itemList == null) { + itemList = createList(itemString); + } + return itemList; + } + + /** + * Permet de modifier la representation souhaitee + * + * @param f la nouvelle representation par ex: n-na + */ + public void setString(String f) { + String[] fi = f.split("-"); + if (fi.length > 1) { + feedString = fi[0]; + itemString = fi[1]; + } else { + feedString = ""; + itemString = fi[0]; + } + feedList = null; + itemList = null; + } + + /** + * Permet de retourner la representation string + * + * @return par ex: n-nad + */ + public String getString() { + String result = ""; + if (!"".equals(feedString)) { + result = feedString + "-"; + } + result += itemString; + return result; + } + +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,53 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: FeedType.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +/** + * Enumeration of known feed's type. + * <p/> + * Used to generate some feed files. + * + * @author tony + */ +public enum FeedType { + + RSS_0_90("rss_0.90"), + RSS_0_91("rss_0.91"), + RSS_0_92("rss_0.92"), + RSS_0_93("rss_0.93"), + RSS_1_0("rss_1.0"), + RSS_2_0("rss_2.0"), + ATOM_0_3("atom_0.3"), + ATOM_1_0("atom_1.0"); + private String type; + + public String getType() { + return type; + } + + private FeedType(String type) { + this.type = type; + } +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,39 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: FeedURLResolver.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import java.net.MalformedURLException; + +/** + * Permet de convertir une chaine en une URL. Le resolver le plus simple + * peut créer une URL avec la chaine, mais un autre resolver peut utiliser + * cette chaine comme cle dans une base de données pour recuperer la bonne URL. + * + * @author poussin + */ +public interface FeedURLResolver { + + FeedData resolv(String ask) throws MalformedURLException; +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/Field.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,66 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: Field.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +/** + * Enumeration des champs disponibles pour le renderer + * + * @author poussin + */ +public enum Field { + + NAME('n'), IMAGE('i'), DESCRIPTION('d'), AUTHOR('a'), TIME('t'), LINK('l'), CATEGORY('c'); + + /** + * le caractere utilise pour la version compactee d'une configuration de renderer + */ + private char c; + + Field(char c) { + this.c = c; + } + + public char getC() { + return c; + } + + public static Field valueOf(char c) { + for (Field field : values()) { + if (field.c == c) { + return field; + } + } + return null; + } + + public static Field[] getFeedFields() { + return new Field[]{NAME, IMAGE, DESCRIPTION, AUTHOR, TIME, LINK}; + } + + public static Field[] getItemFields() { + return new Field[]{NAME, DESCRIPTION, AUTHOR, TIME, LINK}; + } +} + Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,36 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: HTMLCleaner.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +/** + * Permet de nettoyer une chaine avant incorporation dans du HTML + * + * @author poussin + */ +public interface HTMLCleaner { + + String clean(String s); + +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,39 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: HTMLScriptCleaner.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +/** + * Supprime les balises <script.*</script> de la chaine + * + * @author poussin + */ +public class HTMLScriptCleaner implements HTMLCleaner { + + public String clean(String s) { + String result = s.replaceAll("(?i)(?s)<script.*?</script>", ""); + return result; + } + +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,89 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: RSSConfig.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +/** + * Default configuration for {@link RSSHelper}. + * + * @author poussin + */ +public class RSSConfig { + + /** + * la propriete de configuration qui definit le prefix a jouter pour scruter la configuration + */ + private static final String CONFIGURATION_PREFIX_PROPERTY = RSSServlet.class.getSimpleName() + "_configuration_prefix"; + + + /** + * Temps a partir duquel on reforce une recuperation + */ + public static long TIME_FORCE_RETRIEVED = 5 * 60 * 1000; + public static FeedRendererConfig DEFAULT_RENDERER_CONFIG = new FeedRendererConfig("n-natd"); + public static int DEFAULT_NB_ITEM = 7; + public static Class<? extends FeedRenderer> DEFAULT_RENDERER_CLASS = FeedHTMLRenderer.class; + public static Class<? extends FeedURLResolver> DEFAULT_RESOLVER_CLASS = SimpleFeedURLResolver.class; + + public void setTIME_FORCE_RETRIEVED(long TIME_FORCE_RETRIEVED) { + RSSConfig.TIME_FORCE_RETRIEVED = TIME_FORCE_RETRIEVED; + } + + public void setDEFAULT_RENDERER_CONFIG(String DEFAULT_RENDERER_CONFIG) { + RSSConfig.DEFAULT_RENDERER_CONFIG = new FeedRendererConfig(DEFAULT_RENDERER_CONFIG); + } + + public void setDEFAULT_NBITEM(int DEFAULT_NBITEM) { + RSSConfig.DEFAULT_NB_ITEM = DEFAULT_NBITEM; + } + + public void setDEFAULT_RENDERER_CLASS(Class<? extends FeedRenderer> DEFAULT_RENDERER_CLASS) { + RSSConfig.DEFAULT_RENDERER_CLASS = DEFAULT_RENDERER_CLASS; + } + + public void setDEFAULT_RESOLVER_CLASS(Class<? extends FeedURLResolver> DEFAULT_RESOLVER_CLASS) { + RSSConfig.DEFAULT_RESOLVER_CLASS = DEFAULT_RESOLVER_CLASS; + } + + /** + * @param <S> la classe source de la configuration + */ + public static abstract class RSSConfigInitializer<S> extends ConfigInitializer<S, RSSConfig> { + + /** + * Initialise RSSConfig. + * + * @param config la configuration source + */ + public void init(S config) { + RSSHelper.log.info("with source " + config); + super.init(CONFIGURATION_PREFIX_PROPERTY, RSSConfig.class, config, + "TIME_FORCE_RETRIEVED", + "DEFAULT_RENDERER_CONFIG", + "DEFAULT_NB_ITEM", + "DEFAULT_RENDERER_CLASS", + "DEFAULT_RESOLVER_CLASS"); + } + } +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,344 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: RSSGenerator.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import com.sun.syndication.feed.synd.SyndEntry; +import com.sun.syndication.feed.synd.SyndFeed; +import com.sun.syndication.io.FeedException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.channels.FileChannel; +import java.nio.channels.FileLock; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.Map; + +/** + * generator of rss feeds to be stored in a file + * + * @author tony + */ +public class RSSGenerator { + + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ + static final Log log = LogFactory.getLog(RSSGenerator.class); + /** + * date formater use to save date in feed and entries + */ + public static final DateFormat DATE_PARSER = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); + + /** + * @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 = new RSSGenerator(); + return helper; + } + + + /** + * dictonnary of field <-> property for feed + */ + protected final EnumMap<Field, String> feedProperties; + /** + * dictonnary of field <-> property for entry + */ + protected final EnumMap<Field, String> itemProperties; + /** + * directory where feeds are stored + */ + protected final File generatorDirectory; + /** + * feed format to use * + */ + protected final FeedType format; + /** + * number of feed to use by default + */ + protected final int nbItems; + + protected RSSGenerator() { + this(null); + } + + protected RSSGenerator(EnumMap<Field, String> feedProperties, EnumMap<Field, String> itemProperties, File generatorDirectory, FeedType format, int nbItems) { + this.feedProperties = feedProperties; + this.itemProperties = itemProperties; + this.generatorDirectory = generatorDirectory; + this.format = format; + this.nbItems = nbItems; + } + + protected RSSGenerator(File generatorDirectory) { + + feedProperties = new EnumMap<Field, String>(Field.class); + feedProperties.put(Field.NAME, "title"); + feedProperties.put(Field.LINK, "link"); + // cela engendre des NPE... + feedProperties.put(Field.IMAGE, "image.url"); + feedProperties.put(Field.DESCRIPTION, "description"); + feedProperties.put(Field.AUTHOR, "author"); + feedProperties.put(Field.TIME, "publishedDate"); + feedProperties.put(Field.CATEGORY, "categories"); + + itemProperties = new EnumMap<Field, String>(Field.class); + itemProperties.put(Field.NAME, "title"); + itemProperties.put(Field.LINK, "link"); + itemProperties.put(Field.IMAGE, null); + itemProperties.put(Field.DESCRIPTION, "description.value"); + itemProperties.put(Field.AUTHOR, "author"); + itemProperties.put(Field.TIME, "publishedDate"); + + this.generatorDirectory = generatorDirectory == null ? new File(RSSGeneratorConfig.GENERATOR_DIRECTORY) : generatorDirectory; + format = FeedType.valueOf(RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT); + nbItems = RSSGeneratorConfig.DEFAULT_GENERATOR_NB_ITEM; + } + + /** + * @param url location where to create the file + * @param type fromat of feed to create + * @param values properties of the feed + * @throws ParseException if pb while parsing date + * @throws IOException if io pb + * @throws FeedException if pb while creating feed + */ + public void createFeedFile(URL url, FeedType type, Map<Field, Object> values) throws IOException, FeedException, ParseException { + if (url == null) { + throw new NullPointerException("can not create a feed with null url"); + } + if (type == null) { + throw new NullPointerException("can not create a feed with null feedtype"); + } + if (values == null || values.isEmpty()) { + //TODO Should check mandatory values (title, link,...) + throw new NullPointerException("can not create a feed with null nor empty values dictonnary"); + } + File f = getFile(url); + + if (f.exists()) { + throw new IllegalStateException("feed already existing in " + f.getName()); + } + + // make sure parent exists + f.getParentFile().mkdirs(); + + // block until can acquire lock + FileLock lock = acquireLock(f); + + try { + + SyndFeed feed = RSSIOUtil.createFeed(feedProperties, type, values); + + RSSIOUtil.saveFeed(f, feed); + + } catch (FeedException e) { + // file must not be created + f.delete(); + throw e; + } catch (ParseException e) { + // file must not be created + f.delete(); + throw e; + } finally { + releaseLock(f, lock); + } + } + + /** + * Add a item to an existing feed file. + * + * @param url location of feed to used + * @param nbEntries number of maximum entries to be written in feed file + * @param values dictionnary of properties to write + * @throws FeedException if feed pb + * @throws IOException if io pb + * @throws ParseException if dateparser pb + */ + public void addItemToFeedFile(URL url, int nbEntries, Map<Field, Object> values) throws IOException, FeedException, ParseException { + if (url == null) { + throw new NullPointerException("can not add a feed's entry with null url"); + } + if (values == null || values.isEmpty()) { + //TODO Should check mandatory values (title, link,...) + throw new NullPointerException("can not add a feed's entry with null nor empty values dictonnary"); + } + File f = getFile(url); + + if (!f.exists()) { + throw new FileNotFoundException("file not existing " + f); + } + + // block until can acquire lock + FileLock lock = acquireLock(f); + + try { + // get feed + SyndFeed feed = RSSIOUtil.readFeed(url); + + // create item + SyndEntry item = RSSIOUtil.createFeedItem(itemProperties, values); + + // add item + feed = RSSIOUtil.addItemToFeed(feed, item, nbEntries, values); + + // save feed into a tmp file + File tmpFile = new File(f.getAbsolutePath() + "-tmp_" + System.nanoTime()); + + RSSIOUtil.saveFeed(tmpFile, feed); + + // move tmpFile to real file + tmpFile.renameTo(f); + } finally { + releaseLock(f, lock); + } + } + + public void deleteFeedFile(URL toURL) { + File f = getFile(toURL); + if (f.exists() && !f.delete()) { + throw new IllegalStateException("could not delete feed " + f.getName()); + } + } + + /** + * @param url + * @param values + * @return the set of modified fields. + * @throws IOException + * @throws FeedException + * @throws ParseException + */ + public EnumSet<Field> updateFeedFile(URL url, Map<Field, Object> values) throws IOException, FeedException, ParseException { + if (url == null) { + throw new NullPointerException("can not add a feed's entry with null url"); + } + if (values == null || values.isEmpty()) { + //TODO Should check mandatory values (title, link,...) + throw new NullPointerException("can not add a feed's entry with null nor empty values dictonnary"); + } + File f = getFile(url); + + if (!f.exists()) { + throw new FileNotFoundException("file not existing " + f); + } + + // block until can acquire lock + FileLock lock = acquireLock(f); + + try { + + SyndFeed feed = RSSIOUtil.readFeed(url); + + // update feed and keep trace of modified fields + EnumSet<Field> modifieds = RSSIOUtil.updateFeed(feed, feedProperties, values); + + // save feed into a tmp file + File tmpFile = new File(f.getAbsolutePath() + "-tmp_" + System.nanoTime()); + + RSSIOUtil.saveFeed(tmpFile, feed); + + // move tmpFile to real file + tmpFile.renameTo(f); + + // feed link has changed + return modifieds; + } finally { + releaseLock(f, lock); + } + } + + public FeedType getFormat() { + return format; + } + + public File getFeedFile(String name) { + return new File(getGeneratorDirectory(), name + ".xml"); + } + + public int getNbItems() { + return nbItems; + } + + /** + * Obtain the file from his url location. + * + * @param url location of the file + * @return the file + * @throws IllegalStateException if uri is not sytax valid + */ + protected File getFile(URL url) throws IllegalStateException { + try { + return new File(url.toURI()); + } catch (URISyntaxException e) { + throw new IllegalStateException("could not obtain file from url " + url, e); + } + } + + protected FileLock acquireLock(File f) throws IOException { + File lockFile = getWriteFileLock(f); + + /*if (!lockFile.exists()) lockFile.createNewFile(); */ + // open file for writing only + FileChannel channel = new RandomAccessFile(lockFile, "rw").getChannel(); + + // block until can acquire lock + + return channel.lock(); + } + + protected File getWriteFileLock(File f) { + return new File(f.getParentFile(), f.getName() + ".wlock"); + } + + protected void releaseLock(File f, FileLock lock) throws IOException { + // release lock + lock.release(); + // close channel + lock.channel().close(); + // delete file lock + File lockFile = getWriteFileLock(f); + // delete lock file + lockFile.delete(); + } + + public File getGeneratorDirectory() { + return generatorDirectory; + } + +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,97 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: RSSGeneratorConfig.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import java.io.File; + +/** + * Default Configuration for {@link RSSGenerator}. + * + * @author chemit + */ +public class RSSGeneratorConfig { + + /** + * la propriete de configuration qui definit le prefix a jouter pour scruter la configuration + */ + private static final String CONFIGURATION_PREFIX_PROPERTY = RSSGeneratorServlet.class.getSimpleName() + "_configuration_prefix"; + /** + * nombre d'items max à ecrire dans le fichier du flux + */ + public static int DEFAULT_GENERATOR_NB_ITEM = 100; + /** + * le format par défaut duflux à générer + */ + public static String DEFAULT_GENERATOR_FORMAT = "RSS_2_0"; + /** + * le répertoire où générer les flux + */ + public static String GENERATOR_DIRECTORY = "/tmp/rssinclude"; + /** + * le caractère séparateur des listes de métas (categorie par exemple) + */ + public static String DEFAULT_LIST_SEPARATOR = ";"; + + public void setDEFAULT_GENERATOR_NB_ITEM(int DEFAULT_GENERATOR_NB_ITEM) { + RSSGeneratorConfig.DEFAULT_GENERATOR_NB_ITEM = DEFAULT_GENERATOR_NB_ITEM; + } + + public void setDEFAULT_GENERATOR_FORMAT(String DEFAULT_GENERATOR_FORMAT) { + RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT = DEFAULT_GENERATOR_FORMAT; + } + + public void setGENERATOR_DIRECTORY(String GENERATOR_DIRECTORY) { + RSSGeneratorConfig.GENERATOR_DIRECTORY = GENERATOR_DIRECTORY; + } + + public void setDEFAULT_LIST_SEPARATOR(String DEFAULT_LIST_SEPARATOR) { + RSSGeneratorConfig.DEFAULT_LIST_SEPARATOR = DEFAULT_LIST_SEPARATOR; + } + + /** + * @param <S> la classe source de la configuration + */ + public static abstract class RssGeneratorConfigInitializer<S> extends ConfigInitializer<S, RSSGeneratorConfig> { + + /** + * Initialise RSSGeneratorConfig. + * + * @param config la configuration source + */ + public void init(S config) { + RSSGenerator.log.info("with source " + config); + + super.init(CONFIGURATION_PREFIX_PROPERTY, RSSGeneratorConfig.class, config, + "DEFAULT_GENERATOR_NB_ITEM", + "DEFAULT_GENERATOR_FORMAT", + "DEFAULT_LIST_SEPARATOR", + "GENERATOR_DIRECTORY"); + + // create delegate directory + new File(GENERATOR_DIRECTORY).mkdirs(); + + } + } +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,250 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: RSSGeneratorServlet.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import com.sun.syndication.feed.synd.SyndFeed; +import com.sun.syndication.io.FeedException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * <p/> + * Servlet permettant de generer des flux generes par RSSGenerator et de + * les publier. + * + * @author chemit + */ +public class RSSGeneratorServlet extends BaseServlet<RSSGenerator> { + + private static final long serialVersionUID = 1L; + + public void doCreateFeed(HttpServletRequest request, HttpServletResponse response, String feedName, File file) throws ServletException, IOException { + String type = request.getParameter("feedType"); + FeedType feedType = null; + if (type != null) { + try { + feedType = FeedType.valueOf(type); + } catch (Exception e) { + feedType = null; + } + } + if (feedType == null) { + feedType = delegate.getFormat(); + } + String description = request.getParameter("feedDescription"); + String link = request.getParameter("feedLink"); + String author = request.getParameter("feedAuthor"); + String categories = request.getParameter("feedCategories"); + Map<Field, Object> values = new HashMap<Field, Object>(); + values.put(Field.NAME, feedName); + addFieldValue(Field.DESCRIPTION, description, values); + addFieldValue(Field.LINK, link, values); + addFieldValue(Field.AUTHOR, author, values); + addFieldValue(Field.CATEGORY, categories, values); + values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new Date())); + try { + delegate.createFeedFile(file.toURI().toURL(), feedType, values); + } catch (Exception ex) { + throw new ServletException(ex); + } + + String redirect = request.getParameter("from"); + if (redirect != null) { + response.sendRedirect(redirect); + } + } + + public void doDeleteFeed(HttpServletRequest request, HttpServletResponse response, String feedName, File file) throws ServletException, IOException { + try { + delegate.deleteFeedFile(file.toURI().toURL()); + } catch (Exception ex) { + throw new ServletException(ex); + } + + String redirect = request.getParameter("from"); + if (redirect != null) { + response.sendRedirect(redirect); + } + } + + public void doAddItem(HttpServletRequest request, HttpServletResponse response, String feedName, File file) throws ServletException, IOException { + + Integer nbItems = convertToInt(request.getParameter("nbItems")); + if (nbItems == null) { + nbItems = RSSGeneratorConfig.DEFAULT_GENERATOR_NB_ITEM; + } + String description = request.getParameter("itemDescription"); + String link = request.getParameter("itemLink"); + String author = request.getParameter("itemAuthor"); + String name = request.getParameter("itemName"); + + Map<Field, Object> values = new HashMap<Field, Object>(); + addFieldValue(Field.NAME, name, values); + addFieldValue(Field.DESCRIPTION, description, values); + addFieldValue(Field.LINK, link, values); + addFieldValue(Field.AUTHOR, author, values); + values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new Date())); + try { + delegate.addItemToFeedFile(file.toURI().toURL(), nbItems, values); + } catch (Exception ex) { + throw new ServletException(ex); + } + + String redirect = request.getParameter("from"); + if (redirect != null) { + response.sendRedirect(redirect); + } + } + + public void doList(HttpServletResponse response) throws IOException { + // obtain the list of known feeds + File[] files = delegate.getGeneratorDirectory().listFiles(new FileFilter() { + + public boolean accept(File pathname) { + return pathname.isFile() && pathname.getName().endsWith(".xml"); + } + }); + response.setContentType("text/xml;charset=UTF-8"); + PrintWriter out = response.getWriter(); + + try { + if (files.length > 0) { + String format = "<option value=\"%1$s\">%1$s</option>"; + for (File f : files) { + String name = f.getName(); + out.println(String.format(format, name.substring(0, name.length() - 4))); + } + } else { + out.println("<span class='error'>no feed generated</span>"); + } + } finally { + out.close(); + } + } + + public void doShow(File file, String feedName, HttpServletResponse response) throws ServletException, IOException { + // no action, just publication + if (!file.exists()) { + throw new ServletException("could not find feed " + feedName); + } + response.setContentType("text/xml;charset=UTF-8"); + PrintWriter out = response.getWriter(); + try { + SyndFeed feed = RSSIOUtil.readFeed(file.toURI().toURL()); + RSSIOUtil.saveFeed(out, feed); + } catch (IllegalArgumentException ex) { + throw new ServletException(ex); + } catch (FeedException ex) { + throw new ServletException(ex); + } finally { + out.close(); + } + } + + @Override + protected ConfigInitializer<ServletConfig, ?> newConfigInitializer() { + return new RSSGeneratorConfig.RssGeneratorConfigInitializer<ServletConfig>() { + + protected String getConfigValue(ServletConfig config, String fullConfigName) { + return config.getInitParameter(fullConfigName); + } + }; + } + + @Override + protected RSSGenerator newDelegate() throws Exception { + return RSSGenerator.newDefaultInstance(); + } + + /** + * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. + * + * @param request servlet request + * @param response servlet response + * @throws IOException TODO + * @throws ServletException TODO + */ + @Override + protected void processRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + String action = request.getParameter("action"); + if (action == null) { + action = ""; + } + action = action.trim().toLowerCase(); + if ("list".equals(action)) { + doList(response); + return; + } + + String feedName = request.getParameter("feedName"); + + if (feedName == null || "".equals(feedName)) { + throw new ServletException("could not find feedName parameter"); + } + //feedName =new String(feedName.getBytes(),0,feedName.length(),Charset.forName("utf-8")); + File file = new File(delegate.getGeneratorDirectory(), feedName + ".xml"); + + if ("show".equals(action)) { + doShow(file, feedName, response); + return; + } + + if ("create".equals(action)) { + doCreateFeed(request, response, feedName, file); + return; + } + + if ("delete".equals(action)) { + doDeleteFeed(request, response, feedName, file); + return; + } + + if ("additem".equals(action)) { + doAddItem(request, response, feedName, file); + return; + } + + throw new ServletException("action '" + action + "' is unknown "); + + } + + protected void addFieldValue(Field field, String value, Map<Field, Object> values) { + if (value != null && !"".equals(value.trim())) { + values.put(field, value); + } + } +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,151 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: RSSHelper.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import com.sun.syndication.feed.synd.SyndEntry; +import com.sun.syndication.feed.synd.SyndFeed; +import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.net.MalformedURLException; +import java.util.List; + +/** + * @author poussin + */ +public class RSSHelper { + + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ + static final Log log = LogFactory.getLog(RSSHelper.class); + + /** + * @return une nouvelle instance de RssHelper en utilisant les implantations + * definies dans RSSConfig. + * @throws Exception pour tout pb lors de l'instanciation des objects + */ + public static RSSHelper newDefaultInstance() throws Exception { + FeedURLResolver r = RSSConfig.DEFAULT_RESOLVER_CLASS.newInstance(); + FeedRenderer rr = RSSConfig.DEFAULT_RENDERER_CLASS.newInstance(); + RSSHelper helper = new RSSHelper(r, rr); + return helper; + } + + /** + * La classe permettant de resoudre les urls + */ + protected FeedURLResolver resolver; + /** + * on utilise des soft reference pour eviter de trop utiliser la memoire + * key: String, value: FeedData + */ + protected ReferenceMap feeds = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); + protected FeedRenderer renderer; + + /** + * Utilise un SimpleFeedURLResolver comme resolver de feed + */ + public RSSHelper() { + this(new SimpleFeedURLResolver(), new FeedHTMLRenderer(new HTMLScriptCleaner())); + } + + public RSSHelper(FeedURLResolver resolver, FeedRenderer renderer) { + this.resolver = resolver; + this.renderer = renderer; + } + + public void setResolver(FeedURLResolver resolver) { + this.resolver = resolver; + } + + public void setRenderer(FeedRenderer renderer) { + this.renderer = renderer; + } + + public FeedRenderer getRenderer() { + return renderer; + } + + public FeedURLResolver getResolver() { + return resolver; + } + + public void removeFeed(String feedName) { + feeds.remove(feedName); + } + + /** + * Permet de recuperer un certain nombre d'item du feed demande + * + * @param feedName nom du feed souhaite, l'url sera resolu avec le FeedURLResolver + * @param representation indique les champs en sortie souhaites (ex: n-nt) + * @param nbItem le nombre d'item du feed souhaite + * @param forceReload un flag pour forcer la relecture du feed + * @return le code html representant le feed + */ + public String getHTML(String feedName, String representation, Integer nbItem, boolean forceReload) { + try { + FeedData feed = (FeedData) feeds.get(feedName); + if (forceReload || feed == null || feed.getLastRetrived() + RSSConfig.TIME_FORCE_RETRIEVED < System.currentTimeMillis()) { + feed = resolver.resolv(feedName); + if (feed == null) { + log.warn("could not find feed for " + feedName); + return "<span class='feed-error'>No feed found for " + feedName + "</span>"; + } + feeds.put(feedName, feed); + } + + FeedRendererConfig c; + if (representation != null) { + c = new FeedRendererConfig(representation); + } else { + c = feed.getRendererConfig(); + } + + int nb; + if (nbItem != null) { + nb = nbItem; + } else { + nb = feed.getNbItem(); + } + + SyndFeed sf = feed.getFeed(); + //TODO Deal with NPE... if feed is null + List<?> syndEntries = sf.getEntries(); + if (nb >= 0 && syndEntries.size() >= nb) { + syndEntries = syndEntries.subList(syndEntries.size() - nb, syndEntries.size()); + } + SyndEntry[] items = syndEntries.toArray(new SyndEntry[syndEntries.size()]); + + String result = renderer.render(c, sf, items); + return result; + } catch (MalformedURLException eee) { + log.warn("Can't resolv feed url: " + feedName, eee); + return "<span class='feed-error'>" + eee.getMessage() + "</span>"; + } + } +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,259 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: RSSIOUtil.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import com.sun.syndication.feed.synd.SyndCategory; +import com.sun.syndication.feed.synd.SyndCategoryImpl; +import com.sun.syndication.feed.synd.SyndContent; +import com.sun.syndication.feed.synd.SyndContentImpl; +import com.sun.syndication.feed.synd.SyndEntry; +import com.sun.syndication.feed.synd.SyndEntryImpl; +import com.sun.syndication.feed.synd.SyndFeed; +import com.sun.syndication.feed.synd.SyndFeedImpl; +import com.sun.syndication.io.FeedException; +import com.sun.syndication.io.SyndFeedInput; +import com.sun.syndication.io.SyndFeedOutput; +import com.sun.syndication.io.XmlReader; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.net.URL; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +/** + * helper to read or save a feed + * + * @author tony + */ +public class RSSIOUtil { + + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ + static final Log log = LogFactory.getLog(RSSIOUtil.class); + + /** + * Load a feed from his url + * + * @param url location of feed + * @return the java pojo feed + * @throws IllegalArgumentException + * @throws FeedException + * @throws IOException + */ + public static SyndFeed readFeed(URL url) throws IllegalArgumentException, FeedException, IOException { + SyndFeedInput input = new SyndFeedInput(); + SyndFeed feed = input.build(new XmlReader(url)); + return feed; + } + + /** + * save a feed into a file. + * + * @param file + * @param feed + * @throws IOException + * @throws FeedException + */ + public static void saveFeed(File file, SyndFeed feed) throws IOException, FeedException { + SyndFeedOutput output = new SyndFeedOutput(); + output.output(feed, file); + } + + /** + * save a feed into a writer. + * + * @param writer + * @param feed + * @throws IOException + * @throws FeedException + */ + public static void saveFeed(Writer writer, SyndFeed feed) throws IOException, FeedException { + SyndFeedOutput output = new SyndFeedOutput(); + output.output(feed, writer); + } + + public static SyndFeed createFeed(EnumMap<Field, String> feedProperties, FeedType type, Map<Field, Object> values) throws ParseException { + SyndFeed feed = new SyndFeedImpl(); + feed.setFeedType(type.getType()); + feed.setEncoding("utf-8"); + fillFeed(values, feedProperties, feed, false); + return feed; + } + + public static EnumSet<Field> updateFeed(URL url, EnumMap<Field, String> feedProperties, Map<Field, Object> values) throws ParseException, IllegalArgumentException, FeedException, IOException { + SyndFeed feed = RSSIOUtil.readFeed(url); + return updateFeed(feed, feedProperties, values); + } + + public static EnumSet<Field> updateFeed(SyndFeed feed, EnumMap<Field, String> feedProperties, Map<Field, Object> values) throws ParseException, IllegalArgumentException, FeedException, IOException { + EnumSet<Field> modifieds = fillFeed(values, feedProperties, feed, true); + return modifieds; + } + + @SuppressWarnings({"unchecked"}) + protected static SyndFeed addItemToFeed(SyndFeed feed, SyndEntry item, int nbEntries, Map<Field, Object> values) throws IOException, IllegalArgumentException, FeedException, ParseException { + List<SyndEntry> entries = feed.getEntries(); + if (!entries.isEmpty()) { + // always sort by publication date + Collections.sort(entries, new FeedEntryComparator()); + // keep only nbEntries -1 entries + while (entries.size() > nbEntries - 1) { + entries.remove(0); + } + } + entries.add(item); + if (log.isDebugEnabled()) { + log.debug("new item " + item); + } + return feed; + } + + public static SyndEntry createFeedItem(EnumMap<Field, String> itemProperties, Map<Field, Object> values) throws ParseException { + + SyndEntry feedEntry = new SyndEntryImpl(); + + for (Entry<Field, Object> entry : values.entrySet()) { + Field field = entry.getKey(); + String name = itemProperties.get(field); + if (name == null) { + // this field is not managed + log.warn("the field " + field + " is not managed in item"); + continue; + } + Object value = entry.getValue(); + Object realValue; + switch (field) { + case TIME: + realValue = RSSGenerator.DATE_PARSER.parse((String) value); + break; + case DESCRIPTION: + //TODO Deal with xml content ? + SyndContent description = new SyndContentImpl(); + description.setType("text/plain"); + feedEntry.setDescription(description); + realValue = String.valueOf(value); + break; + default: + realValue = value; + } + setFieldValue(feedEntry, name, realValue); + } + + return feedEntry; + } + + protected static EnumSet<Field> fillFeed(Map<Field, Object> values, EnumMap<Field, String> feedProperties, SyndFeed feed, boolean treateModfied) throws ParseException { + EnumSet<Field> modifieds = EnumSet.noneOf(Field.class); + + for (Entry<Field, Object> entry : values.entrySet()) { + Field field = entry.getKey(); + String name = feedProperties.get(field); + if (name == null) { + // this field is not managed + log.warn("the field " + field + " is not managed in feed"); + continue; + } + Object value = entry.getValue(); + Object realValue; + switch (field) { + case TIME: + realValue = RSSGenerator.DATE_PARSER.parse((String) value); + break; + case CATEGORY: + List<String> categoriesAsList = new ArrayList<String>(); + if (value instanceof List) { + categoriesAsList = (List) value; + } else { + // categories as String + String cats = String.valueOf(value); + String[] categories = cats.split(RSSGeneratorConfig.DEFAULT_LIST_SEPARATOR); + categoriesAsList = Arrays.asList(categories); + } + realValue = new ArrayList<SyndCategory>(); + for (String cat : categoriesAsList) { + SyndCategory scat = new SyndCategoryImpl(); + scat.setName(cat); + ((List) realValue).add(scat); + } + break; + default: + realValue = value; + } + if (treateModfied) { + Object oldValue = getFieldValue(feed, name); + if (oldValue == null) { + if (realValue != null) { + modifieds.add(field); + } + } else { + if (!oldValue.equals(realValue)) { + modifieds.add(field); + } + } + } + setFieldValue(feed, name, realValue); + } + return modifieds; + } + + protected static void setFieldValue(Object dst, String name, Object value) { + if (value == null) { + // null value is not managed + log.warn("null value for field " + name + " is not managed"); + return; + } + try { + BeanUtils.setProperty(dst, name, value); + } catch (Exception ex) { + log.warn("could not access property " + name, ex); + } + } + + protected static Object getFieldValue(Object dst, String name) { + try { + return BeanUtils.getProperty(dst, name); + } catch (Exception ex) { + log.warn("could not access property " + name, ex); + return null; + } + } + + protected RSSIOUtil() { + // no instance + } +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,183 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: RSSServlet.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; + +/** + * <p> + * Servlet permettant de retourner un feed RSSHelper en une representation HTML. + * Si la servlet est appele sans parametre alors le code JS permettant d'utiliser + * cette servlet en Ajax est retourne. + * </p><p> + * Sinon la servlet peut prendre en parametre: + * <li> feedName: le nom du feed souhaite + * <li> nbItem: le nombre d'item du feed a retourner + * <li> feedRepr: le chaine permettant de connaitre les champs du feed voulu + * </p><p> + * Utilisation dans une page HTML. Dans le header ajouter + * <pre> + * <script src="url/to/RSSServlet"></script> + * </pre> + * Dans le corps placer un element div avec un id particulier. + * Et soit a la fin de la page soit juste apres le div, ajouter le script + * <pre> + * rssinclude('feedName', 'divid', 5, 'n-n'); + * </pre> + * </p> + * + * @author poussin + */ +public class RSSServlet extends BaseServlet<RSSHelper> { + + /** + * Le code JavaScript a utilise dans les pages clientes + * <p/> + * Provient du fichier rssinclude.js + * cat rssinclude.js |sed 's/"/\\"/g' |sed -re 's/^(.*)$/"\1\\n" +/' + */ + protected static String js = + "function rssincludeUpdateDiv(div, background) {\n" + + " // mettre background a false est utile lorsque l'on appelle la methode\n" + + " // depuis une fenetre que l'on ferme ensuite\n" + + " var serlvetUrl = \"%1$s\"; \n" + + " win = window;\n" + + " var xhr = null;\n" + + " var error=null;\n" + + " var feedName = div.getAttribute(\"feedName\");\n" + + " if (!feedName) // pas de feed name, fatal error\n" + + " error = \"<span class='feed-error'>Aucun feed name detecte...</span>\"; \n" + + " else if(win.XMLHttpRequest) // Firefox, Opera detected\n" + + " xhr = new win.XMLHttpRequest();\n" + + " else if(win.ActiveXObject) // Internet Explorer detected\n" + + " xhr = new win.ActiveXObject(\"Microsoft.XMLHTTP\");\n" + + " else // XMLHttpRequest non supporte par le navigateur\n" + + " error = \"<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>\"; \n" + + " if (!!error) { div.innerHTML = error; return; } \n" + + " \n" + + " var nbItem = div.getAttribute(\"nbItem\");\n" + + " var feedRepr = div.getAttribute(\"feedRepr\"); \n" + + " var forceReload = div.getAttribute(\"forceReload\"); \n" + + " var url = serlvetUrl+(serlvetUrl.indexOf('?')>-1?'&':'?')+\"feedName=\" + escape(feedName); \n" + + " if (!!nbItem) {url += '&nbItem=' + escape(nbItem);} \n" + + " if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);}\n" + + " if (!!forceReload) {url += '&forceReload=true';}\n" + + "\n" + + " xhr.open(\"GET\", url, !!background);\n" + + " xhr.onreadystatechange = function() {\n" + + " if(xhr.readyState == 1) div.innerHTML = \"Chargement du flux '\"+feedName+\"'\";\n" + + " if(xhr.readyState == 4) div.innerHTML = xhr.responseText;\n" + + " }\n" + + " xhr.send(null);\n" + + "}\n" + + "var initRss =function () {\n" + + " var divs = document.getElementsByTagName(\"div\"); \n" + + " var i = 0;var max=divs.length; \n" + + " var toTreate = [];\n" + + " while (i < max) {\n" + + " var div = divs[i++];\n" + + " if (div.getAttribute('name')=='rssinclude') toTreate[toTreate.length] = div;\n" + + " }\n" + + " i=0;max = toTreate.length;\n" + + " while (i<max) rssincludeUpdateDiv(toTreate[i++], true);" + + "}\n" + + "if (window.addEventListener) window.addEventListener( 'load', initRss,false);\n" + + "else if (window.attachEvent) window.attachEvent( 'onload', initRss);"; + + private static final long serialVersionUID = 1L; + + /** + * @param url current url to add in script + * @return the rssinclude script, patched with url + */ + public static String getJs(String url) { + String code = String.format(js, url); + return code; + } + + public void doJs(HttpServletResponse response, HttpServletRequest request) throws IOException { + // on renvoie le code js + response.setContentType("text/plain;charset=UTF-8"); + PrintWriter out = response.getWriter(); + try { + String code = getJs(request.getRequestURL().toString()); + out.println(code); + } finally { + out.close(); + } + } + + public void doRender(HttpServletResponse response, HttpServletRequest request, String feedName) throws IOException { + response.setContentType("text/html;charset=UTF-8"); + PrintWriter out = response.getWriter(); + try { + String feedRepr = request.getParameter("feedRepr"); + Integer nbItem = convertToInt(request.getParameter("nbItem")); + boolean forceReload = "true".equalsIgnoreCase(request.getParameter("forceReload")); + out.println(delegate.getHTML(feedName, feedRepr, nbItem, forceReload)); + } finally { + out.close(); + } + } + + @Override + protected ConfigInitializer<ServletConfig, ?> newConfigInitializer() { + return new RSSConfig.RSSConfigInitializer<ServletConfig>() { + + protected String getConfigValue(ServletConfig config, String fullConfigName) { + return config.getInitParameter(fullConfigName); + } + }; + } + + @Override + protected RSSHelper newDelegate() throws Exception { + return RSSHelper.newDefaultInstance(); + } + + /** + * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. + * + * @param request servlet request + * @param response servlet response + * @throws IOException TODO + * @throws ServletException TODO + */ + @Override + protected void processRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + String feedName = request.getParameter("feedName"); + if (feedName == null || "".equals(feedName)) { + doJs(response, request); + } else { + doRender(response, request, feedName); + } + } +} Added: trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java =================================================================== --- trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java (rev 0) +++ trunk/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,46 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: SimpleFeedURLResolver.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import java.net.MalformedURLException; +import java.net.URL; + +/** + * Par defaut retourne un FeedData ou la chaine passer est convertie en URL, + * le nombre d'item est positionne a -1 et le renderer a n-natd + * + * @author poussin + */ +public class SimpleFeedURLResolver implements FeedURLResolver { + + public FeedData resolv(String ask) throws MalformedURLException { + URL url = new URL(ask); + FeedData result = new FeedData(url); + result.setNbItem(RSSConfig.DEFAULT_NB_ITEM); + result.setRendererConfig(RSSConfig.DEFAULT_RENDERER_CONFIG); + return result; + } + +} Added: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt (rev 0) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,15 @@ +This plugin was developped by Code Lutin + +Installation Instructions +1. Copy rssinclude directory into "editor/plugins/" + +2. Copy myfckconfig.js in fckeditor root path and customize it (or merge the + content in your already customized config...) + +3. To create an editor use this code + +var oFCKeditor = new FCKeditor( 'editorName' ) ; +oFCKeditor.Config["CustomConfigurationsPath"] = oFCKeditor.BasePath+"/myfckconfig.js"; +oFCKeditor.Create() ; + +Please let me know if you experience any issues. Added: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/button.rss.gif =================================================================== (Binary files differ) Property changes on: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/button.rss.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html (rev 0) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,207 @@ + + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Rss Include Properties</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta name="robots" content="noindex, nofollow"> + <script src="../../dialog/common/fck_dialog_common.js" + type="text/javascript"></script> + <script src="fck_rssinclude.js" type="text/javascript"></script> + <link href="../../dialog/common/fck_dialog_common.css" rel="stylesheet" + type="text/css"/> + <style type="text/css">div.rssinclude { background-color: #ffff00; }</style> + <script type="text/javascript"> +  + </script> +</head> +<body scroll="no"> +<div id="divInfo"> + <table cellspacing="1" cellpadding="1" border="0" width="100%" + height="100%"> + <tr> + <td> + <table cellspacing="0" cellpadding="0" width="100%" border="0"> + <tr> + <td valign="top" width="100%"> + <span fckLang="DlgRssincludeFeedName">name or URL</span><br> + + <div id="divFeedName" style="margin-top:2"> + <input style="width: 100%" type="text" + id="txtFeedName" + onblur="updatePreview();"> + </div> + <a id="editFeed" href='#' + fckLang="DlgRssincludeFeedNameEdit" + target="_editFeed">Edit</a> + <a id="addFeed" href='#' + fckLang="DlgRssincludeFeedNameAdd" + target="_addFeed">Add</a> + <script type="text/javascript"> +  + </script> + </td> + </tr> + </table> + <hr width="100%" color="#000000" size="2"> + </td> + </tr> + <tr height="100%"> + <td valign="top"> + <table cellspacing="0" cellpadding="0" width="100%" border="0" + height="100%"> + <tr> + <td height="140" valign="top"> + <br> + <table cellspacing="2" cellpadding="1" border="0"> + <tr> + <td><span fckLang="DlgRssincludeNbItem">Item's number</span>  + </td> + <td><input type="text" size="3" + id="txtNbItem" + onblur="updatePreview();"></td> + </tr> + <tr> + <td><span fckLang="DlgRssincludeFeedRepr">feed representation</span>  + </td> + <td><input type="text" size="10" + id="txtFeedRepr" + onblur="updatePreview();"></td> + </tr> + </table> + </td> + <td>   </td> + <td width="100%" valign="top"> + <table cellpadding="0" cellspacing="0"> + <tr> + <td><span + fckLang="DlgImgPreview">Preview</span> + </td> + </tr> + <tr> + <td valign="top"> + <div class="ImagePreviewArea"> + <div + id="rssincludePreview" + name="rssinclude" + class="rssinclude"> + </div> + + Magnus es, domine, et laudabilis + valde: magna virtus tua, et + sapientiae tuae non est numerus. et + laudare te vult + homo, aliqua portio creaturae tuae, + et homo circumferens mortalitem + suam, + circumferens testimonium peccati sui + et testimonium, quia superbis + resistis: et + tamen laudare te vult homo, aliqua + portio creaturae tuae.tu excitas, ut + laudare + te delectet, quia fecisti nos ad te + et inquietum est cor nostrum, donec + requiescat in te. da mihi, domine, + scire et intellegere, utrum sit + prius + invocare te an laudare te, et scire + te prius sit an invocare te. sed + quis te + invocat nesciens te? aliud enim pro + alio potest invocare nesciens. an + potius + invocaris, ut sciaris? quomodo autem + invocabunt, in quem non crediderunt? + aut + quomodo credent sine praedicante? et + laudabunt dominum qui requirunt eum. + quaerentes enim inveniunt eum et + invenientes laudabunt eum. quaeram + te, domine, + invocans te, et invocem te credens + in te: praedicatus enim es nobis. + invocat + te, domine, fides mea, quam dedisti + mihi, quam inspirasti mihi per + humanitatem + filii tui, per ministerium + praedicatoris tui. + </div> + </td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + </table> +</div> +</body> +</html> Added: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js (rev 0) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,159 @@ +var dialog = window.parent; +var oEditor = dialog.InnerDialogLoaded(); +var FCK = oEditor.FCK; +var FCKLang = oEditor.FCKLang; +var FCKConfig = oEditor.FCKConfig; +var FCKTools = oEditor.FCKTools; + +// Set the language direction. +window.document.dir = oEditor.FCKLang.Dir; + +// load rssinclude script +document.writeln("<script type=\"text/javascript\" src=\""+FCKConfig.RssScriptURL+"\"></script>"); + +// Recuperation du feed selectionne +var oRss = dialog.Selection.GetSelectedElement(); + +// Un peu de travail au chargement de la page +window.onload = function() +{ + // Translate the dialog box texts. + oEditor.FCKLanguageManager.TranslatePage(document); + + // chargement de la combo avec les feeds configures + LoadCombo(); + + // Load the selected element information (if any). + LoadSelection(); + + // Activate the "OK" button. + window.parent.SetOkButton( true ); + + SelectField( 'txtFeedName' ); +} + +/** + * Remplace le textfield de saisie du nom d'un feed par une combo. + * Cela n'est fait que si le serveur peut etre contacte + */ +function LoadCombo() { + var xhr = null; + if(window.XMLHttpRequest) // Firefox + xhr = new window.XMLHttpRequest(); + else if(window.ActiveXObject) // Internet Explorer + xhr = new window.ActiveXObject("Microsoft.XMLHTTP"); + + if (xhr) { + xhr.open("GET", FCKConfig.RssKnownFeedsURL, true); + xhr.onreadystatechange = function() { + if(xhr.readyState == 4 && xhr.status == 200) /* 200 : code HTTP pour OK */ + { + var content = '<select style="WIDTH: 100%" id="txtFeedName" onblur="updatePreview(this);">'+ + xhr.responseText + '</select>'; + document.getElementById("divFeedName").innerHTML = content; + if (oRss) { + // on selectionne l'ancienne valeur + GetE('txtFeedName').value = GetAttribute( oRss, 'feedname', '' ); + } + } + } + xhr.send(null); + } +} + +/** + * Chargement du feed que l'on re-edite + */ +function LoadSelection() { + if (! oRss) return; + GetE('txtFeedName').value = GetAttribute( oRss, 'feedname', '' ); + GetE('txtNbItem').value = GetAttribute( oRss, 'nbitem', '' ); + GetE('txtFeedRepr').value = GetAttribute( oRss, 'feedrepr', '' ); + + updatePreview(); +} + +/** + * Fonction appeler lors de la validation + */ +function Ok() +{ + if ( GetE('txtFeedName').value.length == 0 ) + { + GetE('txtFeedName').focus(); + + alert( oEditor.FCKLang.DlgRssincludeAlertFeedName ); + return false ; + } + + oEditor.FCKUndo.SaveUndoStep(); + if ( !oRss ) + { + oRss = FCK.InsertElement( 'DIV' ) ; + if (!detectScript()) { + // add script to editor only once + oScript = FCK.InsertElement('SCRIPT'); + SetAttribute( oScript, 'src', FCKConfig.RssScriptURL); + } + } + updateRss( oRss ); + + // rssincludeUpdateDiv(oRss, false); + return true; +} + +/** + * Detection de la presence ou non du script rssinclude dans l'edition + */ +function detectScript() { + var scripts = FCK.GetXHTML(); + return (scripts.indexOf("src=\""+FCKConfig.RssScriptURL+"\"")!=-1); +} + +/** + * Mise a jour d'un div avec les informations trouvees dans l'interface + */ +function updateRss(e){ + e.contentEditable = false; + + SetAttribute( e, 'class', 'rssinclude'); + SetAttribute( e, 'contentEditable', 'false'); + SetAttribute( e, 'name', 'rssinclude'); + SetAttribute( e, 'feedname', GetE('txtFeedName').value ); + SetAttribute( e, 'nbitem', GetE('txtNbItem').value ); + SetAttribute( e, 'feedrepr', GetE('txtFeedRepr').value ); + //SetAttribute( e, 'forceReload', 'true' ); + e.innerHTML = 'RSS ' + GetE('txtFeedName').value + ' (items:'+GetE('txtNbItem').value+')'; +} + +// L'element servant a la preview +var ePreview ; + +/** + * Mise a jour du flux dans la preview + * @param combo la combo utilisee (undefined si uniquement un input) + */ +function updatePreview(combo){ + + if ( !ePreview ) { + ePreview = GetE('rssincludePreview'); + } + + if ( ! ePreview) { + return; + } + + if ( GetE('txtFeedName').value.length == 0 ) { + ePreview.innerHTML = 'Invalid RSS'; + } else { + if (!!combo) { + // mise à jour des champs à partir de l'option selectionne + var index = combo.options.selectedIndex; + var option = combo.options[index]; + GetE('txtNbItem').value = GetAttribute( option, 'nbitem', '' ) + GetE('txtFeedRepr').value = GetAttribute( option, 'feedrepr', '' ) + } + updateRss(ePreview); + rssincludeUpdateDiv(ePreview, true); + } +} Added: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js (rev 0) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,53 @@ +// Register the related commands. +var dialogPath = FCKConfig.PluginsPath + 'rssinclude/fck_rssinclude.html'; +var rssincludeDialogCmd = new FCKDialogCommand( FCKLang["DlgRssincludeTitle"], FCKLang["DlgRssincludeTitle"], dialogPath, 480, 470 ); +FCKCommands.RegisterCommand( 'rssinclude', rssincludeDialogCmd ) ; + +// Create the Rssinclude toolbar button. +var oRssincludeItem = new FCKToolbarButton( 'rssinclude', FCKLang["DlgRssincludeTitle"]) ; +oRssincludeItem.IconPath = FCKConfig.PluginsPath + 'rssinclude/button.rss.gif' ; + +FCKToolbarItems.RegisterItem( 'rssinclude', oRssincludeItem ) ; +// 'Rssinclude' is the name used in the Toolbar config. + +FCK.ContextMenu.RegisterListener( { + AddItems : function( menu, tag, tagName ) { + var e = tag; + if (! (e && e.nodeName == 'DIV' && e.getAttribute('name') == 'rssinclude' )) { + var selection = FCKSelection.GetSelection() ; + var range = selection.getRangeAt(0) ; + e = range.endContainer ; + while (e && (e.nodeName != 'DIV' || e.getAttribute('name') != 'rssinclude')) { + e = e.parentNode; + } + } + + // under what circumstances do we display this option + if (!!e && e.nodeName == 'DIV' && e.getAttribute('name') == 'rssinclude' ) { + FCKSelection.SelectNode(e); + // when the option is displayed, show a separator the command + menu.AddSeparator() ; + // the command needs the registered command name, the title for the context menu, and the icon path + menu.AddItem( 'rssinclude', FCKLang.DlgRssincludeTitle, oRssincludeItem.IconPath ) ; + } + } +} ); + +/** +OnClick = function( e ) +{ + if ( e.target.tagName == 'DIV' && e.target.getAttribute('class') == 'rssinclude' ) + FCKSelection.SelectNode( e.target ) ; +} + +FCK.EditorDocument.addEventListener( 'click', OnClick, true ) ; +**/ + +OnDoubleClick = function( e ) { + if ( e.tagName == 'DIV' && e.getAttribute('name') == 'rssinclude' ) { + FCKSelection.SelectNode(e); + FCKCommands.GetCommand( 'rssinclude' ).Execute() ; + } +} + +FCK.RegisterDoubleClickHandler( OnDoubleClick, 'DIV' ) ; Added: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js (rev 0) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,9 @@ +// Rssinclude Dialog +FCKLang["DlgRssincludeTitle"] = "Rss Include"; +FCKLang["DlgRssincludeFeedName"] = "name or URL" ; +FCKLang["DlgRssincludeFeedNameEdit"] = "Edit" ; +FCKLang["DlgRssincludeFeedNameAdd"] = "Add" ; +FCKLang["DlgRssincludeNbItem"] = "item's number" ; +FCKLang["DlgRssincludeFeedRepr"] = "Feed representation" ; +FCKLang["DlgRssincludeAlertFeedName"] = "Please input the feed name or feed URL" +FCKLang["DlgRssincludeLoading"] = "Loading rss..." Added: trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js (rev 0) +++ trunk/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,9 @@ +// Rssinclude Dialog +FCKLang["DlgRssincludeTitle"] = "Rss Include"; +FCKLang["DlgRssincludeFeedName"] = "nom ou URL" ; +FCKLang["DlgRssincludeFeedNameEdit"] = "Edition" ; +FCKLang["DlgRssincludeFeedNameAdd"] = "Ajout" ; +FCKLang["DlgRssincludeNbItem"] = "nombre d'item" ; +FCKLang["DlgRssincludeFeedRepr"] = "Feed representation" ; +FCKLang["DlgRssincludeAlertFeedName"] = "Veuillez entrer un nom ou une URL pour le feed" +FCKLang["DlgRssincludeLoading"] = "Chargement du rss..." Added: trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js =================================================================== --- trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js (rev 0) +++ trunk/nuiton-rss/src/main/resources/fckeditor/myfckconfig.js 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,65 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2008 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Editor configuration settings. + * + * Follow this link for more information: + * http://wiki.fckeditor.net/Developer%27s_Guide/Configuration/Configurations_… + */ + +FCKConfig.Plugins.Add("rssinclude", "en,fr"); + +FCKConfig.ToolbarSets["Default"] = [ + ['Source','DocProps','-','Save','NewPage','Preview','-','Templates'], + ['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'], + ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'], + ['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'], + ['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], + ['Link','Unlink','Anchor'], + ['rssinclude', 'Image','Flash','Table','Rule','Smiley','SpecialChar','PageBreak'], + '/', + ['Style','FontFormat','FontName','FontSize'], + ['TextColor','BGColor'], + ['FitWindow','ShowBlocks','-','About'] // No comma for the last row. +] ; + +// to authorize user to add a new feed +FCKConfig.RssCanAddFeed = false; + +// to authorize user to edit a known feed +FCKConfig.RssCanEditFeed = false; + +// url to render a feed +FCKConfig.RssRenderURL = '/nuitonrss-2.4/RSSServlet&feedName=' ; + +// url to obtain rssinclude script +FCKConfig.RssScriptURL = '/nuitonrss-2.4/RSSServlet' ; + +// url to obtain known feeds as a list of html options +FCKConfig.RssKnownFeedsURL = '/nuitonrss-2.4/feeds.txt' ; + +// url to create a new feed +FCKConfig.RssAddURL = ''; + +// url to edit a known feed +FCKConfig.RssEditURL = '' ; Added: trunk/nuiton-rss/src/main/resources/log4j.properties =================================================================== --- trunk/nuiton-rss/src/main/resources/log4j.properties (rev 0) +++ trunk/nuiton-rss/src/main/resources/log4j.properties 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,33 @@ +### +# #%L +# Nuiton Utils :: Nuiton RSS +# +# $Id: log4j.properties 2001 2010-12-30 11:25:14Z tchemit $ +# $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/resources/… $ +# %% +# 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=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X +# package level +log4j.logger.org.nuiton.rss=INFO Added: trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/nuiton-rss/src/main/webapp/WEB-INF/web.xml 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee + http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <display-name>RSSServlet</display-name> + + <servlet> + <servlet-name>RSSServlet</servlet-name> + <servlet-class>org.nuiton.rss.RSSServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>RSSServlet</servlet-name> + <url-pattern>/RSSServlet</url-pattern> + </servlet-mapping> + <servlet> + <servlet-name>RSSGeneratorServlet</servlet-name> + <servlet-class>org.nuiton.rss.RSSGeneratorServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>RSSGeneratorServlet</servlet-name> + <url-pattern>/RSSGeneratorServlet</url-pattern> + </servlet-mapping> + +</web-app> Added: trunk/nuiton-rss/src/main/webapp/feed.css =================================================================== --- trunk/nuiton-rss/src/main/webapp/feed.css (rev 0) +++ trunk/nuiton-rss/src/main/webapp/feed.css 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,109 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: feed.css 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/main/webapp/fee… $ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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% + */ +.rssinclude { + border: 1px dotted black; +} + +.rss-feed { + display: block; +} + +.rss-items { + clear: both; + display: block; +} + +.rss-items li { + clear: both; + display: block; +} + +.feed-name { + font-weight: bold; + color: blue; + display: block; +} + +.feed-link { + font-size: 10px; +} + +.feed-time{ + font-size: 10px; + clear: both; + display: block; +} + +.feed-image { + /*float: right;*/ + border: 1px dotted black; + margin: 0 0 15px 20px; +} + +.feed-description { + clear: both; + display: block; + font-style: italic; + color: green; + font-size: 10px; +} + +.feed-author { + color: black; + font-size: 10px; +} + +.feedItem-name { + font-weight: bold; + color: red; + display: block; + clear: both; + font-size: 10px; +} + +.feedItem-link { + font-size: 10px; +} + +.feedItem-description { + font-style: italic; + color: gray; + font-size: 10px; + clear: both; + display: block; +} + +.feedItem-author { + color: black; + font-size: 10px; + clear: both; + display: block; +} + +.feedItem-time{ + font-size: 10px; + clear: both; + display: block; +} Added: trunk/nuiton-rss/src/main/webapp/feeds.txt =================================================================== --- trunk/nuiton-rss/src/main/webapp/feeds.txt (rev 0) +++ trunk/nuiton-rss/src/main/webapp/feeds.txt 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,7 @@ +<option value="http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml" nbitem="1" feedrepr="indat-natd">le monde informatique</option> +<option value="http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" nbitem="2" feedrepr="indat-natd">le monde</option> +<option value="http://blog.developpez.com/xmlsrv/rss2.php?blog=42" nbitem="3" feedrepr="indat-natd">developpez.com</option> +<option value="http://formats-ouverts.org/rss.php" nbitem="4" feedrepr="indat-natd">formats ouverts</option> +<option value="http://www.h2database.com/html/newsfeed-rss.xml" nbitem="5" feedrepr="indat-natd">h2</option> +<option value="http://www.opensi.org/news.rss" nbitem="6" feedrepr="indat-natd">opensi</option> + Added: trunk/nuiton-rss/src/main/webapp/index.html =================================================================== --- trunk/nuiton-rss/src/main/webapp/index.html (rev 0) +++ trunk/nuiton-rss/src/main/webapp/index.html 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,49 @@ + + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>Page de tests</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +</head> +<body> +<h1>NuitonRSS tests index</h1> +<ul> + <li><a href="testRender.html" target="render">Test de rendu</a></li> + <li><a href="testGenerator.html" target="generator">Test de génération + de flux</a></li> + <li><a href="testFck.html" target="fck">Test du plugin rssinclude dans + fckeditor 2.6</a> (*) + </li> +</ul> +<p>(*) required a FCKEditor 2.6 available on / apache path (means /fckeditor + points to fckeditor root directory)</p> +</body> +</html> Added: trunk/nuiton-rss/src/main/webapp/rssgenerator.js =================================================================== --- trunk/nuiton-rss/src/main/webapp/rssgenerator.js (rev 0) +++ trunk/nuiton-rss/src/main/webapp/rssgenerator.js 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,47 @@ +function rssgeneratorUpdateDiv(divs) { + var serlvetUrl = "RSSGeneratorServlet?action=list"; + win = window; + var xhr = null; + var error=null; + if(win.XMLHttpRequest) // Firefox, Opera detected + xhr = new win.XMLHttpRequest(); + else if(win.ActiveXObject) // Internet Explorer detected + xhr = new win.ActiveXObject("Microsoft.XMLHTTP"); + else // XMLHttpRequest non supporte par le navigateur + error = "<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>"; + if (!!error) { updateDiv(divs,false,error); return; } + + xhr.open("GET", serlvetUrl, true); + xhr.onreadystatechange = function() { + if(xhr.readyState == 1) { updateDiv(divs,false,"Chargement de la liste des feeds en cours..."); } + else if(xhr.readyState == 4) { updateDiv(divs,true,xhr.responseText); } + } + xhr.send(null); +} + +var initRssGenerator =function () { + var divs = document.getElementsByTagName("div"); + var i = 0;var max=divs.length; + var toTreate = []; + while (i < max) { + var div = divs[i++]; + if (div.getAttribute('name')=='rssgeneratorlist') toTreate[toTreate.length] = div; + } + rssgeneratorUpdateDiv(toTreate); +} +var updateDiv= function(divs,select,text) { + var i=0; + var max = divs.length; + while (i<max) { + var divText=text; + var div = divs[i++]; + if (!!select && text.indexOf("error")==-1) { + var name = div.getAttribute("action"); + divText = "<select name='"+name+"' length='50'>" + text+"</select>" + } + div.innerHTML =divText; + } +} +// load initRssGenerator +if (window.addEventListener) window.addEventListener( 'load', initRssGenerator,false); +else if (window.attachEvent) window.attachEvent( 'onload', initRssGenerator); Added: trunk/nuiton-rss/src/main/webapp/rssinclude.js =================================================================== --- trunk/nuiton-rss/src/main/webapp/rssinclude.js (rev 0) +++ trunk/nuiton-rss/src/main/webapp/rssinclude.js 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,49 @@ +function rssincludeUpdateDiv(div, background) { + // mettre background a false est utile lorsque l'on appelle la methode + // depuis une fenetre que l'on ferme ensuite + //var serlvetUrl = "%1$1"; + var serlvetUrl = "http://localhost:8083/nuitonrss-2.4/RSSServlet"; + win = window; + var xhr = null; + var error=null; + var feedName = div.getAttribute("feedName"); + if (!feedName) // pas de feed name, fatal error + error = "<span class='feed-error'>Aucun feed name detecte...</span>"; + else if(win.XMLHttpRequest) // Firefox, Opera detected + xhr = new win.XMLHttpRequest(); + else if(win.ActiveXObject) // Internet Explorer detected + xhr = new win.ActiveXObject("Microsoft.XMLHTTP"); + else // XMLHttpRequest non supporte par le navigateur + error = "<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>"; + if (!!error) { div.innerHTML = error; return; } + + var nbItem = div.getAttribute("nbItem"); + var feedRepr = div.getAttribute("feedRepr"); + var forceReload = div.getAttribute("forceReload"); + var url = serlvetUrl+(serlvetUrl.indexOf('?')>-1?'&':'?')+"feedName=" + escape(feedName); + if (!!nbItem) {url += '&nbItem=' + escape(nbItem);} + if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);} + if (!!forceReload) {url += '&forceReload=true';} + + xhr.open("GET", url, !!background); + xhr.onreadystatechange = function() { + if(xhr.readyState == 1) div.innerHTML = "Chargement du flux '"+feedName+"' en cours..."; + if(xhr.readyState == 4) div.innerHTML = xhr.responseText; + } + xhr.send(null); +} + +var initRss =function () { + var divs = document.getElementsByTagName("div"); + var i = 0;var max=divs.length; + var toTreate = []; + while (i < max) { + var div = divs[i++]; + if (div.getAttribute('name')=='rssinclude') toTreate[toTreate.length] = div; + } + i=0;max = toTreate.length; + while (i<max) rssincludeUpdateDiv(toTreate[i++], true); +} +if (window.addEventListener) window.addEventListener( 'load', initRss,false); +else if (window.attachEvent) window.attachEvent( 'onload', initRss); + Added: trunk/nuiton-rss/src/main/webapp/testFck.html =================================================================== --- trunk/nuiton-rss/src/main/webapp/testFck.html (rev 0) +++ trunk/nuiton-rss/src/main/webapp/testFck.html 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,75 @@ + + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>Page de test plugin FCKEditor rss</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +  + <script type="text/javascript" src="/fckeditor/fckeditor.js"></script> + <style type="text/css">div.rssinclude { background-color: #ffff00; }</style> +</head> +<body> +<h1>Test plugin FCKEditor RSS (*)</h1> + +<form name="EditPostView" action="#" method="GET"> + <script type="text/javascript"> +  + </script> + <hr/> + <input type="submit" value="envoyer"> +</form> +<p>(*) required a FCKEditor 2.6 available on / apache path (means /fckeditor + points to fckeditor root directory)</p> + +<p>add custom config like this code : + <pre> +var oFCKeditor = new FCKeditor( 'rssTest' ) ; +oFCKeditor.Config["CustomConfigurationsPath"] = oFCKeditor.BasePath+"/myfckconfig.js"; +oFCKeditor.Create() ; + </pre> +</p> + + +</body> +</html> Added: trunk/nuiton-rss/src/main/webapp/testGenerator.html =================================================================== --- trunk/nuiton-rss/src/main/webapp/testGenerator.html (rev 0) +++ trunk/nuiton-rss/src/main/webapp/testGenerator.html 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,152 @@ + + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>Page de test de génération de flux rss</title> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + <style type="text/css"> + .error {color:red; display:block;} + fieldset {height:140px;} + iframe { width:100%;height:400px;} + </style> + <script src="rssgenerator.js"></script> + <script> + var doAction=function(action) { + var form = document.feeds; + form.action.value=action; + if (action=='show'){ + //form.method='get'; + form.target='content'; + } else { + //form.action.value=action; + //form.method='post'; + form.target=''; + } + return true; + } + </script> +</head> +<body> +<h1>Test RSS Generator</h1> +<table width="100%"> + <tr> + <td width="50%" valign="top"> + <form method="post" action="RSSGeneratorServlet"> + <fieldset> + <legend> <input type="submit" + value="create a new feed">  + </legend> + <input type="hidden" name="action" value="create"> + <input type="hidden" name="from" value="testGenerator.html"> + <table> + <tr> + <td>feedName (*) :</td> + <td><input name="feedName" type="text" size="50"> + </td> + </tr> + <tr> + <td>feedDescription (*) :</td> + <td><input name="feedDescription" type="text" + size="50"></td> + </tr> + <tr> + <td>feedLink (*) :</td> + <td><input name="feedLink" type="text" size="50"> + </td> + </tr> + <tr> + <td>feedAuthor :</td> + <td><input name="feedAuthor" type="text" size="50"> + </td> + </tr> + <tr> + <td>feedCategories :</td> + <td><input name="feedCategories" type="text" + size="50"></td> + </tr> + <tr> + <td style="font-size:11px">(*)  Mandatory + field + </td> + </tr> + </table> + </fieldset> + </form> + </td> + <td width="50%" valign="top"> + <form name="feeds" method="post" action="RSSGeneratorServlet"> + <fieldset> + <legend> <input type="submit" value="add item to feed" + onclick="return doAction('addItem');">  + <input type="submit" value="delete feed" + onclick="return doAction('delete');">   + <input type="submit" value="show feed" + onclick="return doAction('show');">  + </legend> + <input type="hidden" name="from" value="testGenerator.html"> + <input type="hidden" name="action" value=""> + <table> + <tr> + <td>feedName :</td> + <td> + <div name="rssgeneratorlist" + action="feedName"></div> + </td> + </tr> + <tr> + <td>itemName :</td> + <td><input name="itemName" type="text" size="50"> + </td> + </tr> + <tr> + <td>itemDescription:</td> + <td><input name="itemDescription" type="text" + size="50"></td> + </tr> + <tr> + <td>itemLink :</td> + <td><input name="itemLink" type="text" size="50"> + </td> + </tr> + <tr> + <td>itemAuthor :</td> + <td><input name="itemAuthor" type="text" size="50"> + </td> + </tr> + </table> + </fieldset> + </form> + </td> + </tr> +</table> +<iframe name="content" scrolling="yes" frameborder="1"></iframe> +</body> +</html> Added: trunk/nuiton-rss/src/main/webapp/testRender.html =================================================================== --- trunk/nuiton-rss/src/main/webapp/testRender.html (rev 0) +++ trunk/nuiton-rss/src/main/webapp/testRender.html 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,60 @@ + + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>Page de test rss</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <link href="feed.css" rel="stylesheet" type="text/css"/> + <script src="RSSServlet"></script> +</head> +<body> +<h1>Test RSS</h1> + +<div name="rssinclude" class="rssinclude" + feedName="http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml" + nbItem="1" feedRepr="indat-natd"></div> +<div name="rssinclude" class="rssinclude" + feedName="http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" nbItem="2" + feedRepr="indat-natd"></div> +<div name="rssinclude" class="rssinclude" + feedName="http://blog.developpez.com/xmlsrv/rss2.php?blog=42" nbItem="3" + feedRepr="indat-natd"></div> +<div name="rssinclude" class="rssinclude" + feedName="http://formats-ouverts.org/rss.php" nbItem="4" + feedRepr="indat-natd"></div> +<div name="rssinclude" class="rssinclude" + feedName="http://www.h2database.com/html/newsfeed-rss.xml" nbItem="5" + feedRepr="indat-natd"></div> +<div name="rssinclude" class="rssinclude" + feedName="http://www.opensi.org/news.rss" nbItem="6" + feedRepr="indat-natd"></div> +</body> +</html> Added: trunk/nuiton-rss/src/site/apt/index.apt =================================================================== --- trunk/nuiton-rss/src/site/apt/index.apt (rev 0) +++ trunk/nuiton-rss/src/site/apt/index.apt 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,50 @@ +~~~ +~~ #%L +~~ Nuiton Utils :: Nuiton RSS +~~ +~~ $Id: index.apt 2001 2010-12-30 11:25:14Z tchemit $ +~~ $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/site/apt/index.… $ +~~ %% +~~ 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% +~~~ + ---- + Nuiton RSS + ---- + ---- + 2009-08-23 + ---- + +Présentation + + A faire... + +Utilisation +=========== + + A faire ... + +-------------------------------------------------------------------------------- + <script src="nuitonrss.js"> + rss("rss1", "url", max, login, password) + </script> + <div id="rss1"></div> +-------------------------------------------------------------------------------- + +- si pas de fichier html pour l'url demandée ou plus vielle que N + - récupération de de l'url et sauvegarde en html +- renvoi du html \ No newline at end of file Added: trunk/nuiton-rss/src/site/site_fr.xml =================================================================== --- trunk/nuiton-rss/src/site/site_fr.xml (rev 0) +++ trunk/nuiton-rss/src/site/site_fr.xml 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu name="Téléchargement"> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Added: trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java (rev 0) +++ trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,234 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: RSSGeneratorHelperTest.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/test/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import com.sun.syndication.feed.synd.SyndCategory; +import com.sun.syndication.feed.synd.SyndEntry; +import com.sun.syndication.feed.synd.SyndFeed; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.io.File; +import java.net.MalformedURLException; +import java.text.ParseException; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author tony + */ +public class RSSGeneratorHelperTest { + + private static Log log = LogFactory.getLog(RSSGeneratorHelperTest.class); + + static RSSGenerator helper; + static File f; + + @Before + public void setUp() throws Exception { + if (helper == null) { + helper = RSSGenerator.newDefaultInstance(); + } + if (f == null) { + f = getFeedFile(); + } + } + + @Test + public void testCreateFeed() throws Exception { + + Map<Field, Object> values = new HashMap<Field, Object>(); + values.put(Field.NAME, "feedName : " + f.getName()); + values.put(Field.DESCRIPTION, "feedDescription : " + f.getName()); + values.put(Field.LINK, f.toURI().toURL() + ""); + values.put(Field.AUTHOR, "feed author"); + values.put(Field.CATEGORY, Arrays.asList("categorie1", "categorie2")); + values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new Date())); + + Assert.assertFalse(f.exists()); + if (log.isInfoEnabled()) { + log.info("feedFile : " + f); + } + helper.createFeedFile(f.toURI().toURL(), helper.getFormat(), values); + // no lock + Assert.assertFalse(helper.getWriteFileLock(f).exists()); + // file exist + Assert.assertTrue(f.exists()); + + SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); + + if (log.isDebugEnabled()) { + log.debug(feed); + } + + Assert.assertEquals(feed.getFeedType(), helper.getFormat().getType()); + Assert.assertEquals(feed.getLink(), values.get(Field.LINK)); + Assert.assertEquals(feed.getTitle(), values.get(Field.NAME)); + Assert.assertEquals(feed.getDescription(), values.get(Field.DESCRIPTION)); + Assert.assertEquals(feed.getAuthor(), values.get(Field.AUTHOR)); + List<?> cats = (List<?>) values.get(Field.CATEGORY); + for (Object o : feed.getCategories()) { + SyndCategory cat = (SyndCategory) o; + Assert.assertTrue(cats.contains(cat.getName())); + } + Assert.assertEquals(feed.getPublishedDate(), RSSGenerator.DATE_PARSER.parse((String) values.get(Field.TIME))); + + } + + @Test + public void testCreateFeedAlreadyExisting() throws Exception { + + Map<Field, Object> values = new HashMap<Field, Object>(); + values.put(Field.NAME, "feedName : " + f.getName()); + values.put(Field.DESCRIPTION, "feedDescription : " + f.getName()); + values.put(Field.LINK, f.toURI().toURL() + ""); + values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new Date())); + + Assert.assertTrue(f.exists()); + + try { + helper.createFeedFile(f.toURI().toURL(), helper.getFormat(), values); + // file already exist, can not reach this code + Assert.fail(); + } catch (IllegalStateException e) { + Assert.assertTrue(true); + } + // no write lock + Assert.assertFalse(helper.getWriteFileLock(f).exists()); + + } + + @Test + public void testAddFeedEntry() throws Exception { + Assert.assertTrue(f.exists()); + Map<Field, Object> values = createEntry(0); + + helper.addItemToFeedFile(f.toURI().toURL(), 2, values); + + SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); + + List entries = feed.getEntries(); + Assert.assertEquals(1, entries.size()); + + if (log.isDebugEnabled()) { + log.debug(feed); + } + + SyndEntry entry = (SyndEntry) entries.get(0); + + assertEntry(entry, values); + } + + @Test + public void testAddFeedEntryToMax() throws Exception { + + Assert.assertTrue(f.exists()); + SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); + + List entries = feed.getEntries(); + Assert.assertEquals(1, entries.size()); + SyndEntry firsEntry = (SyndEntry) entries.get(0); + + Map<Field, Object> values; + + int nbMaxEntries = 10; + + for (int i = 1; i < nbMaxEntries; i++) { + values = createEntry(i); + helper.addItemToFeedFile(f.toURI().toURL(), nbMaxEntries, values); + feed = RSSIOUtil.readFeed(f.toURI().toURL()); + + entries = feed.getEntries(); + Assert.assertEquals(i + 1, entries.size()); + + SyndEntry entry = (SyndEntry) entries.get(i); + + assertEntry(entry, values); + } + + // feed file contains max items + + values = createEntry(nbMaxEntries); + + helper.addItemToFeedFile(f.toURI().toURL(), nbMaxEntries, values); + + feed = RSSIOUtil.readFeed(f.toURI().toURL()); + + entries = feed.getEntries(); + + Assert.assertEquals(nbMaxEntries, entries.size()); + + SyndEntry entry = (SyndEntry) entries.get(nbMaxEntries - 1); + + assertEntry(entry, values); + + // check orginal first entry is no more present + entry = (SyndEntry) entries.get(0); + Assert.assertFalse(firsEntry.getTitle().equals(entry.getTitle())); + } + + @Test + public void testCleanFile() throws Exception { + try { + Assert.assertNotNull(f); + Assert.assertTrue(f.exists()); + // lock is delete + Assert.assertFalse(helper.getWriteFileLock(f).exists()); + } finally { + if (f != null) { + f.deleteOnExit(); + } + } + } + + protected void assertEntry(SyndEntry entry, Map<Field, Object> values) throws ParseException { + Assert.assertEquals(entry.getLink(), values.get(Field.LINK)); + Assert.assertEquals(entry.getTitle(), values.get(Field.NAME)); + Assert.assertEquals(entry.getDescription().getValue(), values.get(Field.DESCRIPTION)); + Assert.assertEquals(entry.getAuthor(), values.get(Field.AUTHOR)); + Assert.assertEquals(entry.getPublishedDate(), RSSGenerator.DATE_PARSER.parse((String) values.get(Field.TIME))); + } + + protected File getFeedFile() { + return helper.getFeedFile(getClass().getSimpleName() + "-" + System.nanoTime()); + } + + protected Map<Field, Object> createEntry(int number) throws MalformedURLException { + Map<Field, Object> values = new HashMap<Field, Object>(); + values.put(Field.NAME, "entryName : " + f.getName() + "-" + number); + values.put(Field.DESCRIPTION, "entryDescription : " + f.getName() + "-" + number); + values.put(Field.AUTHOR, "author-" + number); + values.put(Field.LINK, f.toURI().toURL() + "/entry-" + number); + values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new Date())); + return values; + } + +} Added: trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java =================================================================== --- trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java (rev 0) +++ trunk/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,112 @@ +/* + * #%L + * Nuiton Utils :: Nuiton RSS + * + * $Id: RSSTest.java 2001 2010-12-30 11:25:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/test/java/org/n… $ + * %% + * 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% + */ +package org.nuiton.rss; + +import org.apache.commons.beanutils.BeanUtils; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author poussin + */ +public class RSSTest { + + @Test + public void testBeanUtils() throws Exception { +// RSSConfig.class.getField("TIME_FORCE_RETRIEVED").set(null, 10); + System.out.println("TIME:" + RSSConfig.TIME_FORCE_RETRIEVED); + System.out.println("RENDER:" + RSSConfig.DEFAULT_RENDERER_CLASS); + BeanUtils.setProperty(new RSSConfig(), "TIME_FORCE_RETRIEVED", "10"); + BeanUtils.setProperty(new RSSConfig(), "DEFAULT_RENDERER_CLASS", FeedRenderer.class.getName()); + System.out.println("TIME:" + RSSConfig.TIME_FORCE_RETRIEVED); + System.out.println("RENDER:" + RSSConfig.DEFAULT_RENDERER_CLASS); + Assert.assertEquals("java.lang.String", BeanUtils.getProperty("Object", "class.name")); + } + + @Test + public void testCleaner() throws Exception { + String s = "debut<Script src='toto.js'>et du script</scRipt>milieu<scripT>encore du code\n</script>fin"; + + HTMLCleaner cleaner = new HTMLScriptCleaner(); + Assert.assertEquals("debutmilieufin", cleaner.clean(s)); + } + + @Test + public void testRendererConfig() throws Exception { + FeedRendererConfig c = new FeedRendererConfig("indat-ndat"); + + List<Field> l1 = new ArrayList<Field>(); + l1.add(Field.IMAGE); + l1.add(Field.NAME); + l1.add(Field.DESCRIPTION); + l1.add(Field.AUTHOR); + l1.add(Field.TIME); + + List<Field> l2 = new ArrayList<Field>(); + l2.add(Field.NAME); + l2.add(Field.DESCRIPTION); + l2.add(Field.AUTHOR); + l2.add(Field.TIME); + + Assert.assertEquals(l1, c.getFeedFieldOrder()); + Assert.assertEquals(l2, c.getItemFieldOrder()); + Assert.assertEquals("indat-ndat", c.getString()); + } + + /** + * Test of getHTML method, of class RSSHelper. + * TODO do the test, for the moment, do not launch it... + * + * @throws Exception if any pb + */ + @Ignore + public void testGetHTML() throws Exception { + System.out.println("getHTML"); + String feedName = "http://localhost/rss/rss_1.0.xml"; + String feedRepr = "n-ndat"; + int nbItem = -1; + RSSHelper instance = new RSSHelper(); + String expResult = ""; + String result = instance.getHTML(feedName, feedRepr, nbItem, false); + System.out.println("***" + result); + result = instance.getHTML(feedName, feedRepr, nbItem, false); + System.out.println("***" + result); + + Thread.sleep(2000); + + result = instance.getHTML(feedName, feedRepr, nbItem, false); + System.out.println("***" + result); + result = instance.getHTML(feedName, feedRepr, nbItem, false); + System.out.println("***" + result); + // assertEquals(expResult, result); + // TODO review the generated test code and remove the default call to fail. +// fail("The test case is a prototype."); + } + +} Added: trunk/nuiton-rss/src/test/java/resources/log4j.properties =================================================================== --- trunk/nuiton-rss/src/test/java/resources/log4j.properties (rev 0) +++ trunk/nuiton-rss/src/test/java/resources/log4j.properties 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,31 @@ +### +# #%L +# Nuiton Utils :: Nuiton RSS +# +# $Id: log4j.properties 2001 2010-12-30 11:25:14Z tchemit $ +# $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-rss/src/test/java/resou… $ +# %% +# 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=DEBUG, 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 Modified: trunk/nuiton-tapestry/changelog.txt =================================================================== --- trunk/nuiton-tapestry/changelog.txt 2011-01-07 11:05:53 UTC (rev 40) +++ trunk/nuiton-tapestry/changelog.txt 2011-01-07 11:42:13 UTC (rev 41) @@ -0,0 +1,2 @@ +Please refer to the release note : + http://maven-site.nuiton.org/nuiton-tapestry/changes-report.html \ No newline at end of file Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-01-07 11:05:53 UTC (rev 40) +++ trunk/nuiton-tapestry/pom.xml 2011-01-07 11:42:13 UTC (rev 41) @@ -55,7 +55,7 @@   - <name>Nuiton-web :: Tapestry</name> + <name>Nuiton Web :: Nuiton Tapestry</name> <description>Extra classes for Tapestry based applications</description>  Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-07 11:05:53 UTC (rev 40) +++ trunk/pom.xml 2011-01-07 11:42:13 UTC (rev 41) @@ -21,7 +21,7 @@ <modules> <module>nuiton-tapestry</module> -  + <module>nuiton-rss</module> </modules> <dependencyManagement> @@ -38,7 +38,6 @@ <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> <version>${tapestryVersion}</version> - <scope>compile</scope> <exclusions> <exclusion> <groupId>jboss</groupId> @@ -48,10 +47,27 @@ </dependency> <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>${jdomVersion}</version> + </dependency> + + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>${romeVersion}</version> + <exclusions> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4jVersion}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -60,6 +76,13 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servletVersion}</version> + <scope>provided</scope> + </dependency> + </dependencies> </dependencyManagement> @@ -68,7 +91,7 @@   - <name>Nuiton-web</name> + <name>Nuiton Web</name> <description>Common ressources for web applications</description> <inceptionYear>2010</inceptionYear> <url>http://maven-site.nuiton.org/nuiton-web/</url> @@ -108,11 +131,18 @@  <projectId>nuiton-web</projectId> -  + <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> + +  <tapestryVersion>5.2.4</tapestryVersion> - <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <slf4jVersion>1.6.1</slf4jVersion> +  + <romeVersion>0.9</romeVersion> + <jdomVersion>1.1</jdomVersion> + + <servletVersion>2.5</servletVersion> +  <siteLocales>en,fr</siteLocales>

1 0

r40 - in trunk: . nuiton-tapestry nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services
by fdesbois＠users.nuiton.org 07 Jan '11

07 Jan '11

Author: fdesbois Date: 2011-01-07 12:05:53 +0100 (Fri, 07 Jan 2011) New Revision: 40 Url: http://nuiton.org/repositories/revision/nuiton-web/40 Log: - Use org.nuiton.web groupId - Change deprecated apis for Tapestry 5.2 Modified: trunk/nuiton-tapestry/pom.xml trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java trunk/pom.xml Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-01-07 10:43:26 UTC (rev 39) +++ trunk/nuiton-tapestry/pom.xml 2011-01-07 11:05:53 UTC (rev 40) @@ -10,7 +10,7 @@  <parent> - <groupId>org.nuiton</groupId> + <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> <version>1.0-SNAPSHOT</version> </parent> Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java 2011-01-07 10:43:26 UTC (rev 39) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java 2011-01-07 11:05:53 UTC (rev 40) @@ -2,24 +2,21 @@ import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.ClientElement; -import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.AfterRender; -import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectContainer; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.javascript.JavaScriptSupport; /** * A simple mixin for attaching a javascript confirmation box to the onclick * event of any component that implements ClientElement. * * @author fdesbois - * @version $Revision$ - * <p/> - * Last update: $Date$ - * by : $Author$ + * @version $Id$ */ -@IncludeJavaScriptLibrary("confirm.js") +@Import(library = "confirm.js") public class Confirm { @Parameter(value = "Are you sure?", defaultPrefix = BindingConstants.MESSAGE) @@ -29,7 +26,7 @@ private boolean condition; @Inject - private RenderSupport renderSupport; + private JavaScriptSupport javaScriptSupport; @InjectContainer private ClientElement element; @@ -40,7 +37,7 @@ @AfterRender public void afterRender() { if (!wDisabled) { - renderSupport.addScript(String.format("new Confirm('%s', '%s', %b);", + javaScriptSupport.addScript(String.format("new Confirm('%s', '%s', %b);", element.getClientId(), message.replace("'", "\\'"), condition)); } } Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java 2011-01-07 10:43:26 UTC (rev 39) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java 2011-01-07 11:05:53 UTC (rev 40) @@ -25,23 +25,21 @@ import org.apache.tapestry5.ClientElement; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.Link; -import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.Environmental; -import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectContainer; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.javascript.JavaScriptSupport; /** * From <a href="http://tinybits.blogspot.com/2009/05/update-zone-on-any-client-side-event.h…">Ingesol Blog</a> * * @author ingesol - * @version $Revision$ - * <p/> - * Last update: $Date$ - * by : $Author$ + * @author fdesbois + * @version $Id$ */ -@IncludeJavaScriptLibrary("zoneUpdater.js") +@Import(library = "zoneUpdater.js") public class ZoneUpdater { public static final String PLACEHOLDER = "XXX"; @@ -50,7 +48,7 @@ private ComponentResources resources; @Environmental - private RenderSupport renderSupport; + private JavaScriptSupport javaScriptSupport; @Parameter(defaultPrefix = BindingConstants.LITERAL) private String clientEvent; @@ -76,7 +74,8 @@ if (context == null) { context = new Object[]{PLACEHOLDER}; } else { - context = ArrayUtils.add(context, PLACEHOLDER); // To be replaced by javascript + // To be replaced by javascript + context = ArrayUtils.add(context, PLACEHOLDER); } return resources.createEventLink(event, context); @@ -93,7 +92,15 @@ if (listeningElement == null) { listeningElement = "$('" + elementId + "')"; } - renderSupport.addScript("new ZoneUpdater('%s', %s, '%s', '%s', '%s', '%s')", elementId, listeningElement, clientEvent, link, zone, PLACEHOLDER); + javaScriptSupport.addScript( + "new ZoneUpdater('%s', %s, '%s', '%s', '%s', '%s')", + elementId, + listeningElement, + clientEvent, + link, + zone, + PLACEHOLDER + ); } } Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java 2011-01-07 10:43:26 UTC (rev 39) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java 2011-01-07 11:05:53 UTC (rev 40) @@ -32,7 +32,7 @@ * @param <U> user type * @param <A> annotation type used to identify which page need authentication * @author fdesbois - * $Id$ + * @version $Id$ */ public class ServiceAuthenticationImpl<U, A extends Annotation> implements ServiceAuthentication<U> { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-07 10:43:26 UTC (rev 39) +++ trunk/pom.xml 2011-01-07 11:05:53 UTC (rev 40) @@ -15,6 +15,7 @@ <version>2.4.1</version> </parent> + <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> <version>1.0-SNAPSHOT</version>

1 0

r39 - trunk
by fdesbois＠users.nuiton.org 07 Jan '11

07 Jan '11

Author: fdesbois Date: 2011-01-07 11:43:26 +0100 (Fri, 07 Jan 2011) New Revision: 39 Url: http://nuiton.org/repositories/revision/nuiton-web/39 Log: merge problem, properties doubloon Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-07 10:25:59 UTC (rev 38) +++ trunk/pom.xml 2011-01-07 10:43:26 UTC (rev 39) @@ -112,10 +112,6 @@ <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <slf4jVersion>1.6.1</slf4jVersion> -  - <tapestryVersion>5.1.0.5</tapestryVersion> - <nuitonUtilsVersion>1.2.2</nuitonUtilsVersion> -  <siteLocales>en,fr</siteLocales>

1 0

r38 - in trunk: . nuiton-tapestry nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components
by fdesbois＠users.nuiton.org 07 Jan '11

07 Jan '11

Author: fdesbois Date: 2011-01-07 11:25:59 +0100 (Fri, 07 Jan 2011) New Revision: 38 Url: http://nuiton.org/repositories/revision/nuiton-web/38 Log: rename nuiton-tapestry-extra to nuiton-tapestry Added: trunk/nuiton-tapestry/ Removed: trunk/nuiton-tapestry-extra/ Modified: trunk/nuiton-tapestry/pom.xml trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry-extra/pom.xml 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/pom.xml 2011-01-07 10:25:59 UTC (rev 38) @@ -1,87 +1,94 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-web</artifactId> - <version>0.2-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-web-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.nuiton-web</groupId> - <artifactId>nuiton-tapestry-extra</artifactId> + <artifactId>nuiton-tapestry</artifactId> + <dependencies> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> -  -  -  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <name>Nuiton-web :: Tapestry Extra</name> - <description>Extra classes for Tapestry based applications</description> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + </dependency> -  -  -  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> - <packaging>jar</packaging> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <compress>true</compress> - <index>true</index> -  - <manifestEntries> - <Tapestry-Module-Classes> - org.nuiton.web.tapestry5.services.NuitonModule - </Tapestry-Module-Classes> - <Implementation-Version> - ${project.version} - </Implementation-Version> - </manifestEntries> - </archive> - </configuration> - </plugin> + </dependencies> - </plugins> - </build> +  +  +  + <name>Nuiton-web :: Tapestry</name> + <description>Extra classes for Tapestry based applications</description> +  +  +  + + <packaging>jar</packaging> + + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <compress>true</compress> + <index>true</index> +  + <manifestEntries> + <Tapestry-Module-Classes> + org.nuiton.web.tapestry5.services.NuitonModule + </Tapestry-Module-Classes> + <Implementation-Version> + ${project.version} + </Implementation-Version> + </manifestEntries> + </archive> + </configuration> + </plugin> + + </plugins> + </build> + + </project> Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,4 +1,3 @@ - package org.nuiton.web.tapestry5.annotations; import java.lang.annotation.Documented; @@ -10,15 +9,15 @@ /** * This annotation is used on pages and components that need authentication * to be rendered. - * + * <p/> * Created: 3 mai 2010 * * @author fdesbois - * $Id$ + * $Id$ */ -@Target({ ElementType.TYPE }) +(a)Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface RequiresAuthentication { - + } Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java 2011-01-07 10:25:59 UTC (rev 38) @@ -19,9 +19,6 @@ package org.nuiton.web.tapestry5.components; -import java.util.ArrayList; -import java.util.List; - import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.MarkupWriter; @@ -30,16 +27,19 @@ import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.ioc.annotations.Inject; +import java.util.ArrayList; +import java.util.List; + /** * Composant qui affiche des messages à l'utilisateur. - * + * <p/> * Ce composant permet d'afficher des messages avec une apparence différente * selon leur type (info ou erreur). Lors de l'affichage de la page, les * messages seront affichés et la collection de messages sera vidée. - * + * <p/> * Pour personnaliser l'apparence des messages il faut définir les classes * fb-error et fb-info dans le CSS. - * + * <p/> * <pre> * Utilisation : * <t:feedback t:id="feedback"/> @@ -54,13 +54,17 @@ @IncludeStylesheet("feedback.css") public class FeedBack { - @Parameter(defaultPrefix = BindingConstants.LITERAL, value= "true") + @Parameter(defaultPrefix = BindingConstants.LITERAL, value = "true") private boolean autoClear; - /** Messages d'erreur */ + /** + * Messages d'erreur + */ private List<String> errorMessages; - /** Messages d'info */ + /** + * Messages d'info + */ private List<String> infoMessages; private boolean errors; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java 2011-01-07 10:25:59 UTC (rev 38) @@ -10,7 +10,10 @@ * * @author fdesbois <fdesbois(a)codelutin.com> * @version $Id: SubForm.java 3003 2010-05-19 18:25:58Z fdesbois $ + * @deprecated since 0.2, will be removed in next version. Useless since Select + * component could have zone in Tapestry 5.2 */ +@Deprecated public class SubForm { @Parameter Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,9 +1,5 @@ - package org.nuiton.web.tapestry5.data; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.beaneditor.PropertyModel; import org.apache.tapestry5.grid.ColumnSort; @@ -12,11 +8,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * AbstractMappedGridDataSource - * + * <p/> * TODO : javadoc - * + * <p/> * Created: 18 janv. 2010 * * @param <K> Type of the map key @@ -39,14 +39,16 @@ private boolean prepared; - /** Need to be provided by subclass, used by Grid component **/ + /** + * Need to be provided by subclass, used by Grid component * + */ @Override public abstract Class<?> getRowType(); protected abstract int count(); protected abstract Map<K, E> execute(int startIndex, int endIndex, - SortConstraint orderBy); + SortConstraint orderBy); @Override public int getAvailableRows() { @@ -61,7 +63,7 @@ @Override public void prepare(int startIndex, int endIndex, - List<SortConstraint> sortConstraints) { + List<SortConstraint> sortConstraints) { if (log.isDebugEnabled()) { log.debug("Prepare results : " + startIndex + ", " + endIndex); } Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java 2011-01-07 10:25:59 UTC (rev 38) @@ -15,9 +15,9 @@ * * @author fdesbois * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * <p/> + * Last update: $Date$ + * by : $Author$ */ @IncludeJavaScriptLibrary("confirm.js") public class Confirm { @@ -39,10 +39,10 @@ @AfterRender public void afterRender() { - if (!wDisabled) { - renderSupport.addScript(String.format("new Confirm('%s', '%s', %b);", - element.getClientId(), message.replace("'", "\\'"), condition)); - } + if (!wDisabled) { + renderSupport.addScript(String.format("new Confirm('%s', '%s', %b);", + element.getClientId(), message.replace("'", "\\'"), condition)); + } } } Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java 2011-01-07 10:25:59 UTC (rev 38) @@ -37,15 +37,15 @@ * * @author ingesol * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * <p/> + * Last update: $Date$ + * by : $Author$ */ @IncludeJavaScriptLibrary("zoneUpdater.js") public class ZoneUpdater { public static final String PLACEHOLDER = "XXX"; - + @Inject private ComponentResources resources; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,7 +1,5 @@ package org.nuiton.web.tapestry5.services; -import java.io.IOException; -import java.lang.annotation.Annotation; import org.apache.tapestry5.Link; import org.apache.tapestry5.runtime.Component; import org.apache.tapestry5.services.ComponentEventRequestParameters; @@ -14,15 +12,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.lang.annotation.Annotation; + /** * AbstractAuthenticationFilter - * + * <p/> * Created: 3 mai 2010 * * @param <U> type of User * @param <A> type of Annotation that manage authentication on pages/components * @author fdesbois - * $Id$ + * $Id$ */ public abstract class AbstractAuthenticationFilter<U, A extends Annotation> implements ComponentRequestFilter { @@ -45,12 +46,12 @@ } protected abstract Class<?> getRedirectPage( - AuthenticationRedirect redirectType); + AuthenticationRedirect redirectType); public AbstractAuthenticationFilter(PageRenderLinkSource renderLinkSource, - ComponentSource componentSource, Response response, - ServiceAuthentication<U> serviceAuthentication, - Class<A> annotationClass) { + ComponentSource componentSource, Response response, + ServiceAuthentication<U> serviceAuthentication, + Class<A> annotationClass) { this.pageRender = renderLinkSource; this.componentSource = componentSource; this.response = response; @@ -66,7 +67,7 @@ public void handleComponentEvent( ComponentEventRequestParameters parameters, ComponentRequestHandler handler) throws IOException { - + if (logger.isTraceEnabled()) { logger.trace("handleComponentEvent"); } @@ -81,7 +82,7 @@ @Override public void handlePageRender(PageRenderRequestParameters parameters, - ComponentRequestHandler handler) throws IOException { + ComponentRequestHandler handler) throws IOException { if (logger.isTraceEnabled()) { logger.trace("handlePageRender"); Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,24 +1,25 @@ package org.nuiton.web.tapestry5.services; -import java.util.ArrayList; -import java.util.List; import org.apache.tapestry5.Binding; import org.apache.tapestry5.internal.bindings.AbstractBinding; import org.apache.tapestry5.ioc.Location; import org.apache.tapestry5.ioc.Messages; +import java.util.ArrayList; +import java.util.List; + /** * From <a href="http://wiki.apache.org/tapestry/Tapestry5HowToAddMessageFormatBindingPrefix">Tapestry5HowTo</a> * <h2>Usage :</h2> * <pre> * ${format:key=value1,value2} or <t:component t:parameter="format:key=value1,value2"> * </pre> - * + * <p/> * Created: 27 avr. 2010 * + * @author fdesbois + * $Id$ * @see FormatBindingFactory - * @author fdesbois - * $Id$ */ public class FormatBinding extends AbstractBinding { @@ -28,7 +29,7 @@ private final List<Binding> valueBindings; public FormatBinding(Location location, Messages messages, boolean invariant, - ArrayList<Binding> keyBindings, List<Binding> valueBindings) { + ArrayList<Binding> keyBindings, List<Binding> valueBindings) { super(location); this.messages = messages; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,8 +1,5 @@ package org.nuiton.web.tapestry5.services; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import org.apache.tapestry5.Binding; import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.ComponentResources; @@ -10,6 +7,10 @@ import org.apache.tapestry5.services.BindingFactory; import org.apache.tapestry5.services.BindingSource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** * From <a href="http://wiki.apache.org/tapestry/Tapestry5HowToAddMessageFormatBindingPrefix">Tapestry5HowTo</a> * <br \> @@ -21,11 +22,11 @@ * configuration.add("format", new FormatBindingFactory(bindingSource)); * } * </pre> - * + * <p/> * Created: 27 avr. 2010 * * @author fdesbois - * $Id$ + * $Id$ */ public class FormatBindingFactory implements BindingFactory { @@ -42,7 +43,7 @@ @Override public Binding newBinding(String description, ComponentResources container, ComponentResources component, - String expression, Location location) { + String expression, Location location) { int separatorIndex = expression.indexOf(SEPARATOR); if (-1 == separatorIndex) { @@ -66,8 +67,8 @@ } private ArrayList<Binding> createBindings(String description, ComponentResources container, - ComponentResources component, String defaultPrefix, - List<String> expressions, Location location) { + ComponentResources component, String defaultPrefix, + List<String> expressions, Location location) { ArrayList<Binding> bindings = new ArrayList<Binding>(expressions.size()); for (String expression : expressions) { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,4 +1,3 @@ - package org.nuiton.web.tapestry5.services; import org.apache.tapestry5.ioc.Configuration; @@ -9,11 +8,11 @@ /** * NuitonModule - * + * <p/> * Created: 4 mai 2010 * * @author fdesbois - * $Id$ + * $Id$ */ public class NuitonModule { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,4 +1,3 @@ - package org.nuiton.web.tapestry5.services; /** @@ -28,27 +27,27 @@ * MappedConfiguration<Class<?>, * ApplicationStateContribution> configuration, * final ServiceAuthentication<MyUser> serviceAuthentication) { - * + * <p/> * ApplicationStateCreator<MyUser> creator = * new ApplicationStateCreator<MyUser>() { - * + * <p/> * @Override * public MyUser create() { * return serviceAuthentication.getNewUserInstance(); * } * }; - * + * <p/> * configuration.add(MyUser.class, * new ApplicationStateContribution("session", creator)); * } * </pre> - * - * + * <p/> + * <p/> * Created: 3 mai 2010 * * @param <U> user type * @author fdesbois - * $Id$ + * $Id$ */ public interface ServiceAuthentication<U> { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,10 +1,10 @@ - package org.nuiton.web.tapestry5.services; -import java.lang.annotation.Annotation; import org.apache.tapestry5.ioc.internal.util.TapestryException; import org.apache.tapestry5.services.ApplicationStateManager; +import java.lang.annotation.Annotation; + /** * This class is an abstract implementation of {@link ServiceAuthentication}. * This service use {@link ApplicationStateManager} to manage connected user. @@ -26,13 +26,13 @@ * No need to contribute to ApplicationStateManager to provide instantiation * of user. Even this service used the default constructor to instanciate a new * user. - * + * <p/> * Created: 3 mai 2010 * * @param <U> user type * @param <A> annotation type used to identify which page need authentication * @author fdesbois - * $Id$ + * $Id$ */ public class ServiceAuthenticationImpl<U, A extends Annotation> implements ServiceAuthentication<U> { @@ -40,12 +40,12 @@ /** * Tapestry service used to save user in session and retrieve it when * needed. - **/ + */ private final ApplicationStateManager stateManager; - /** + /** * User type - **/ + */ protected Class<U> userClass; /** @@ -57,13 +57,13 @@ /** * Constructor to call in subclasses. * - * @param stateManager from Tapestry - * @param userClass to identify which type of user is managed + * @param stateManager from Tapestry + * @param userClass to identify which type of user is managed * @param annotationClass to identify which type of annotation is managed - * for authentication treatment. + * for authentication treatment. */ public ServiceAuthenticationImpl(ApplicationStateManager stateManager, - Class<U> userClass, Class<A> annotationClass) { + Class<U> userClass, Class<A> annotationClass) { this.stateManager = stateManager; this.userClass = userClass; this.annotationClass = annotationClass; @@ -106,14 +106,14 @@ // No restriction if annotation is not present return true; } - + /** * Check the connected user authorizations. Called in * {@link #isAllowed(Class)} method after detect the annotation on the * current page. Override this method to provide more specific * authentication managment. * - * @param user current user connected. + * @param user current user connected. * @param annotation from page to check authorizations. * @return true if the user is granted, false otherwise */ Modified: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml =================================================================== --- trunk/nuiton-tapestry-extra/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml 2011-01-07 10:25:59 UTC (rev 38) @@ -1,14 +1,16 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" + xmlns:p="tapestry:parameter"> - <t:delegate t:to="activeBlock" /> - <t:block t:id="formBlock"> - <form t:type="form" action="tapestry"> - <t:body /> - </form> - </t:block> - <t:block t:id="noFormBlock"> - <t:body /> - </t:block> +<t:delegate t:to="activeBlock"/> +<t:block t:id="formBlock"> + <form t:type="form" action="tapestry"> + <t:body/> + </form> +</t:block> +<t:block t:id="noFormBlock"> + <t:body/> +</t:block> </html> \ No newline at end of file

1 0

r37 - trunk
by fdesbois＠users.nuiton.org 07 Jan '11

07 Jan '11

Author: fdesbois Date: 2011-01-07 11:24:35 +0100 (Fri, 07 Jan 2011) New Revision: 37 Url: http://nuiton.org/repositories/revision/nuiton-web/37 Log: - Rename nuiton-web artifact to nuiton-web-parent - Rename nuiton-tapestry-extra to nuiton-tapestry - #1199 : deprecate SubForm component Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-07 10:17:55 UTC (rev 36) +++ trunk/pom.xml 2011-01-07 10:24:35 UTC (rev 37) @@ -15,11 +15,11 @@ <version>2.4.1</version> </parent> - <artifactId>nuiton-web</artifactId> - <version>0.2-SNAPSHOT</version> + <artifactId>nuiton-web-parent</artifactId> + <version>1.0-SNAPSHOT</version> <modules> - <module>nuiton-tapestry-extra</module> + <module>nuiton-tapestry</module>  </modules> @@ -52,7 +52,6 @@ <version>${slf4jVersion}</version> <scope>compile</scope> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId>

1 0

r36 - trunk
by fdesbois＠users.nuiton.org 07 Jan '11

07 Jan '11

Author: fdesbois Date: 2011-01-07 11:17:55 +0100 (Fri, 07 Jan 2011) New Revision: 36 Url: http://nuiton.org/repositories/revision/nuiton-web/36 Log: clean pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/pom.xml 2011-01-07 10:17:55 UTC (rev 36) @@ -1,173 +1,170 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.4.1</version> + </parent> + + <artifactId>nuiton-web</artifactId> + <version>0.2-SNAPSHOT</version> + + <modules> + <module>nuiton-tapestry-extra</module> +  + </modules> + + <dependencyManagement> + + <dependencies> + + <dependency> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.4.1</version> - </parent> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> - <artifactId>nuiton-web</artifactId> - <version>0.2-SNAPSHOT</version> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>${tapestryVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> - <modules> - <module>nuiton-tapestry-extra</module> -  - </modules> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + <scope>compile</scope> + </dependency> - <dependencyManagement> - <dependencies> -  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>${tapestryVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - <scope>runtime</scope> - </dependency> -  -  - </dependencies> - </dependencyManagement> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + <scope>runtime</scope> + </dependency> -  -  -  + </dependencies> - <name>Nuiton-web</name> - <description>Common ressources for web applications</description> - <inceptionYear>2010</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-web/</url> + </dependencyManagement> -  - <developers> - <developer> - <id>fdesbois</id> - <name>Florian DESBOIS</name> - <email>florian.desbois(a)gmail.com</email> - <organization>ALMA - Code Lutin</organization> - <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Chef de Projet</role> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>tchemit</id> - <name>Tony Chemit</name> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> +  +  +  -  -  -  + <name>Nuiton-web</name> + <description>Common ressources for web applications</description> + <inceptionYear>2010</inceptionYear> + <url>http://maven-site.nuiton.org/nuiton-web/</url> - <packaging>pom</packaging> +  + <developers> + <developer> + <id>fdesbois</id> + <name>Florian DESBOIS</name> + <email>fdesbois(a)codelutin.com</email> + <organization>Code Lutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> - <properties> +  +  +  -  - <projectId>nuiton-web</projectId> + <packaging>pom</packaging> -  - <tapestryVersion>5.2.4</tapestryVersion> - <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> - <slf4jVersion>1.6.1</slf4jVersion> + <properties> -  - <siteLocales>en,fr</siteLocales> +  + <projectId>nuiton-web</projectId> -  - <license.licenseName>lgpl_v3</license.licenseName> +  + <tapestryVersion>5.2.4</tapestryVersion> + <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> + <slf4jVersion>1.6.1</slf4jVersion> - </properties> +  + <tapestryVersion>5.1.0.5</tapestryVersion> + <nuitonUtilsVersion>1.2.2</nuitonUtilsVersion> - <build> +  + <siteLocales>en,fr</siteLocales> - <pluginManagement> - <plugins> +  + <license.licenseName>lgpl_v3</license.licenseName> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> + </properties> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - </build> + <build> - <reporting> -  - <excludeDefaults>true</excludeDefaults> - </reporting> + <pluginManagement> + <plugins> -  -  -  + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> - </scm> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + </build> + <reporting> +  + <excludeDefaults>true</excludeDefaults> + </reporting> + +  +  +  + + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + </developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + </scm> + </project>

1 0

r35 - in trunk: . nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components
by bleny＠users.nuiton.org 07 Jan '11

07 Jan '11

Author: bleny Date: 2011-01-07 10:58:15 +0100 (Fri, 07 Jan 2011) New Revision: 35 Url: http://nuiton.org/repositories/revision/nuiton-web/35 Log: update to Tapestry 5.2 ; remove use of a deprecated Tapestry stuff Modified: trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java trunk/pom.xml Modified: trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java 2010-11-21 14:31:44 UTC (rev 34) +++ trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java 2011-01-07 09:58:15 UTC (rev 35) @@ -24,7 +24,6 @@ import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.EventConstants; import org.apache.tapestry5.MarkupWriter; -import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.Environmental; import org.apache.tapestry5.annotations.Events; import org.apache.tapestry5.annotations.Parameter; @@ -34,6 +33,7 @@ import org.apache.tapestry5.services.FormSupport; import org.apache.tapestry5.services.Heartbeat; import org.apache.tapestry5.services.Request; +import org.apache.tapestry5.services.javascript.JavaScriptSupport; /** * Corresponds to <input type="submit">, a client-side element that can @@ -97,7 +97,7 @@ private Request request; @Inject - private RenderSupport renderSupport; + private JavaScriptSupport javaScriptSupport; private Element element; @@ -188,11 +188,11 @@ this.defer = defer; } - void setup(ComponentResources resources, FormSupport formSupport, Heartbeat heartbeat, RenderSupport renderSupport) { + void setup(ComponentResources resources, FormSupport formSupport, Heartbeat heartbeat, JavaScriptSupport javaScriptSupport) { this.resources = resources; this.formSupport = formSupport; this.heartbeat = heartbeat; - this.renderSupport = renderSupport; + this.javaScriptSupport = javaScriptSupport; } /** @@ -204,7 +204,7 @@ */ public String getClientId() { if (clientId == null) { - clientId = renderSupport.allocateClientId(resources); + clientId = javaScriptSupport.allocateClientId(resources); element.forceAttributes("id", clientId); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:31:44 UTC (rev 34) +++ trunk/pom.xml 2011-01-07 09:58:15 UTC (rev 35) @@ -47,13 +47,13 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.5.10</version> + <version>${slf4jVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.10</version> + <version>${slf4jVersion}</version> <scope>runtime</scope> </dependency>  - <tapestryVersion>5.1.0.5</tapestryVersion> - <nuitonUtilsVersion>1.2.2</nuitonUtilsVersion> + <tapestryVersion>5.2.4</tapestryVersion> + <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> + <slf4jVersion>1.6.1</slf4jVersion>  <siteLocales>en,fr</siteLocales>

1 0

r34 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:31:44 +0100 (Sun, 21 Nov 2010) New Revision: 34 Url: http://nuiton.org/repositories/revision/nuiton-web/34 Log: Update mavenpom4redmine to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 08:30:25 UTC (rev 33) +++ trunk/pom.xml 2010-11-21 14:31:44 UTC (rev 34) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4</version> + <version>2.4.1</version> </parent> <artifactId>nuiton-web</artifactId>

1 0

r33 - trunk
by tchemit＠users.nuiton.org 29 Oct '10

29 Oct '10

Author: tchemit Date: 2010-10-29 10:30:25 +0200 (Fri, 29 Oct 2010) New Revision: 33 Url: http://nuiton.org/repositories/revision/nuiton-web/33 Log: Update mavenpom4redmine to 2.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 15:02:02 UTC (rev 32) +++ trunk/pom.xml 2010-10-29 08:30:25 UTC (rev 33) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <artifactId>nuiton-web</artifactId>

1 0

r32 - trunk/nuiton-tapestry-extra
by tchemit＠users.nuiton.org 26 Oct '10

26 Oct '10

Author: tchemit Date: 2010-10-26 17:02:02 +0200 (Tue, 26 Oct 2010) New Revision: 32 Url: http://nuiton.org/repositories/revision/nuiton-web/32 Log: add svn:ignore Modified: trunk/nuiton-tapestry-extra/ Property changes on: trunk/nuiton-tapestry-extra ___________________________________________________________________ Modified: svn:ignore - target + target *.ipr *.iws *.iml .settings .classpath .project

1 0

r31 - trunk
by tchemit＠users.nuiton.org 26 Oct '10

26 Oct '10

Author: tchemit Date: 2010-10-26 16:59:27 +0200 (Tue, 26 Oct 2010) New Revision: 31 Url: http://nuiton.org/repositories/revision/nuiton-web/31 Log: add svn:ignore Modified: trunk/ Property changes on: trunk ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath

1 0

r30 - trunk
by tchemit＠users.nuiton.org 26 Oct '10

26 Oct '10

Author: tchemit Date: 2010-10-26 14:58:10 +0200 (Tue, 26 Oct 2010) New Revision: 30 Url: http://nuiton.org/repositories/revision/nuiton-web/30 Log: fix build (use inheritance from mavenpom for commons libs) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 12:13:58 UTC (rev 29) +++ trunk/pom.xml 2010-10-26 12:58:10 UTC (rev 30) @@ -23,10 +23,10 @@ <dependencyManagement> <dependencies> - <dependency> +  <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -61,11 +61,11 @@ <artifactId>tapestry-upload</artifactId> <version>${tapestryVersion}</version> </dependency--> - <dependency> +  </dependencies> </dependencyManagement>

1 0

r29 - trunk
by tchemit＠users.nuiton.org 26 Oct '10

26 Oct '10

Author: tchemit Date: 2010-10-26 14:13:58 +0200 (Tue, 26 Oct 2010) New Revision: 29 Url: http://nuiton.org/repositories/revision/nuiton-web/29 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:39:18 UTC (rev 28) +++ trunk/pom.xml 2010-10-26 12:13:58 UTC (rev 29) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> @@ -26,17 +26,16 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuiton-utils.version}</version> + <version>${nuitonUtilsVersion}</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> - <version>${tapestry.version}</version> + <version>${tapestryVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -60,12 +59,11 @@  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> <scope>test</scope> </dependency> </dependencies> @@ -119,8 +117,8 @@ <projectId>nuiton-web</projectId>  - <tapestry.version>5.1.0.5</tapestry.version> - <nuiton-utils.version>1.2.2</nuiton-utils.version> + <tapestryVersion>5.1.0.5</tapestryVersion> + <nuitonUtilsVersion>1.2.2</nuitonUtilsVersion>  <siteLocales>en,fr</siteLocales> @@ -141,7 +139,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin>

1 0

r28 - trunk
by tchemit＠users.nuiton.org 17 Oct '10

17 Oct '10

Author: tchemit Date: 2010-10-17 03:39:18 +0200 (Sun, 17 Oct 2010) New Revision: 28 Url: http://nuiton.org/repositories/revision/nuiton-web/28 Log: Update mavenpom4redmine to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-08 23:51:47 UTC (rev 27) +++ trunk/pom.xml 2010-10-17 01:39:18 UTC (rev 28) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <artifactId>nuiton-web</artifactId>

1 0

r27 - trunk
by tchemit＠users.nuiton.org 08 Oct '10

08 Oct '10

Author: tchemit Date: 2010-10-09 01:51:47 +0200 (Sat, 09 Oct 2010) New Revision: 27 Url: http://nuiton.org/repositories/revision/nuiton-web/27 Log: Update mavenpom4redmine to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:56:55 UTC (rev 26) +++ trunk/pom.xml 2010-10-08 23:51:47 UTC (rev 27) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <artifactId>nuiton-web</artifactId>

1 0

r26 - trunk
by tchemit＠users.nuiton.org 03 Oct '10

03 Oct '10

Author: tchemit Date: 2010-10-03 17:56:55 +0200 (Sun, 03 Oct 2010) New Revision: 26 Url: http://nuiton.org/repositories/revision/nuiton-web/26 Log: Update mavenpom4redmine to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:11:29 UTC (rev 25) +++ trunk/pom.xml 2010-10-03 15:56:55 UTC (rev 26) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <version>2.3</version> </parent> <artifactId>nuiton-web</artifactId>

1 0

r25 - trunk
by tchemit＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 10:11:29 +0200 (Wed, 29 Sep 2010) New Revision: 25 Url: http://nuiton.org/repositories/revision/nuiton-web/25 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 09:30:58 UTC (rev 24) +++ trunk/pom.xml 2010-09-29 08:11:29 UTC (rev 25) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <artifactId>nuiton-web</artifactId>

1 0

r24 - trunk
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:30:58 +0200 (Thu, 09 Sep 2010) New Revision: 24 Url: http://nuiton.org/repositories/revision/nuiton-web/24 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:21:31 UTC (rev 23) +++ trunk/pom.xml 2010-09-09 09:30:58 UTC (rev 24) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <artifactId>nuiton-web</artifactId>

1 0

r23 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:21:31 +0200 (Sun, 29 Aug 2010) New Revision: 23 Url: http://nuiton.org/repositories/revision/nuiton-web/23 Log: Utilisation de mavenpom4redmine 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-11 14:46:55 UTC (rev 22) +++ trunk/pom.xml 2010-08-29 14:21:31 UTC (rev 23) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <artifactId>nuiton-web</artifactId>

1 0

r22 - trunk
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 16:46:55 +0200 (Wed, 11 Aug 2010) New Revision: 22 Url: http://nuiton.org/repositories/revision/nuiton-web/22 Log: Utilisation de mavenpom4redmine 2.2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 13:16:16 UTC (rev 21) +++ trunk/pom.xml 2010-08-11 14:46:55 UTC (rev 22) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2.1</version> + <version>2.2.3</version> </parent> <artifactId>nuiton-web</artifactId>

1 0