Author: tchemit Date: 2013-12-20 17:56:21 +0100 (Fri, 20 Dec 2013) New Revision: 292 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/292 Log: refs #2979: Use topia 3.0-alpha > 7 Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 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 trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm trunk/pom.xml Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -46,10 +46,10 @@ import org.apache.shiro.web.servlet.AbstractShiroFilter; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; import org.nuiton.config.ApplicationConfig; -import org.nuiton.topia.TopiaApplicationContextCache; -import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.topia.persistence.TopiaApplicationContextCache; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.util.TopiaUtil; import org.nuiton.web.SecurityEntityEnum; import org.nuiton.web.SecurityTopiaApplicationContext; import org.nuiton.web.SecurityTopiaPersistenceContext; @@ -93,7 +93,7 @@ } // get topia root context - config.setOption(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, SecurityEntityEnum.getImplementationClassesAsString()); + config.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, SecurityEntityEnum.getImplementationClassesAsString()); Properties props = config.getFlatOptions(); rootContext = TopiaApplicationContextCache.getContext(props, CREATE_SECURITY_APPLICATION_CONTEXT); initSchema(rootContext); Modified: 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 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -36,7 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.web.struts2.interceptor.OpenTopiaTransactionInterceptor; /** Close a TopiaTransaction instance stored in the servlet context. Modified: 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 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2013-12-20 16:56:21 UTC (rev 292) @@ -34,10 +34,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaPersistenceContext; -import org.nuiton.topia.TopiaTransaction; -import org.nuiton.topia.framework.TopiaTransactionAware; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaTransaction; +import org.nuiton.topia.persistence.TopiaTransactionAware; import org.nuiton.web.struts2.filter.CloseTopiaTransactionFilter; import com.opensymphony.xwork2.ActionInvocation; Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -24,7 +24,7 @@ */ package org.nuiton.web.filter; -import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaPersistenceContext; /** * Implementation of the {@link TypedTopiaTransactionFilter} using the Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -28,10 +28,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Transaction; -import org.nuiton.topia.AbstractTopiaPersistenceContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaPersistenceContext; -import org.nuiton.topia.TopiaTransaction; +import org.nuiton.topia.persistence.TopiaApplicationContext; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaTransaction; +import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -67,7 +68,7 @@ * </li> * <li>{@code unusedMethods}: This parameters configure a set of method names * which should be by-pass when the proxied transaction was not still open (via a - * {@link org.nuiton.topia.AbstractTopiaApplicationContext#newPersistenceContext()} ()}. + * {@link TopiaApplicationContext#newPersistenceContext()}. * When a such method is called on the transaction then the filter will pass in * the hook {@link #onUnusedMethod(Object, Method, Object[])}. * <p/> @@ -159,7 +160,7 @@ protected String requestAttributeName = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; protected TypedTopiaTransactionFilter(Class<PersistenceContext> persistenceContextType) { - if (persistenceContextType==null) { + if (persistenceContextType == null) { throw new NullPointerException("persistenceContextType can't be null"); } if (!persistenceContextType.isInterface()) { Modified: trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm =================================================================== --- trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm 2013-12-20 16:56:21 UTC (rev 292) @@ -14,7 +14,7 @@ package fr.ifremer.echobase.ui; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.web.filter.TopiaTransactionFilter; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/pom.xml 2013-12-20 16:56:21 UTC (rev 292) @@ -272,7 +272,7 @@ <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-alpha-7</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> <!-- Tapestry --> <tapestryVersion>5.2.4</tapestryVersion> <!-- Do not upgrade to 5.3.x because on some incompatibilities -->