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

r122 - trunk
by bleny＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: bleny Date: 2011-10-28 18:03:25 +0200 (Fri, 28 Oct 2011) New Revision: 122 Url: http://nuiton.org/repositories/revision/nuiton-web/122 Log: add myself to pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 16:00:53 UTC (rev 121) +++ trunk/pom.xml 2011-10-28 16:03:25 UTC (rev 122) @@ -208,6 +208,16 @@ <role>Développeur</role> </roles> </developer> + <developer> + <id>bleny</id> + <name>Brendan Le Ny</name> + <email>bleny(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> </developers>

1 0

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; + +/** + *  + * + * The aim of this Interceptor is to manage a {@code transaction} all along + * a action which implements {@link TopiaTransactionAware} contract. + * + * 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. + * + * The interceptor is abstract and let user to implement the way how to open a + * new transaction via the method {@link #beginTransaction()}. + * + * 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}. + * + * Note also that the transaction is not 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. + * + * 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. + *  + * + * Interceptor parameters: + * + *  + * + * <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> + * + *  + * + * @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; -/** - *  - * - * The aim of this Interceptor is to manage a {@code transaction} all along - * a action which implements {@link TopiaTransactionAware} - * contract. - * - * 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. - * - * The interceptor is abstract and let user to implement the way how to open a - * new transaction via the method {@link #beginTransaction()}. - * - * 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}. - * - * 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. - * - * If you do not want any commit for a given action, just put on the class a commit - * - * 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. - *  - * - * Interceptor parameters: - * - *  - * - * <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> - * - *  +/** 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