Author: echatellier Date: 2013-03-18 10:45:21 +0100 (Mon, 18 Mar 2013) New Revision: 254 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/254 Log: Fix dependencies and deprecated code Modified: trunk/nuiton-security/pom.xml trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-struts2/pom.xml trunk/pom.xml Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) 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-03-18 09:41:31 UTC (rev 253) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-18 09:45:21 UTC (rev 254) @@ -49,7 +49,7 @@ import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaUtil; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.config.ApplicationConfig; import org.nuiton.web.SecurityDAOHelper; public class SecurityShiroFilter extends AbstractShiroFilter { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-18 09:45:21 UTC (rev 254) @@ -42,7 +42,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityDAOHelper; Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/nuiton-struts2/pom.xml 2013-03-18 09:45:21 UTC (rev 254) @@ -36,11 +36,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> @@ -56,11 +51,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/pom.xml 2013-03-18 09:45:21 UTC (rev 254) @@ -79,7 +79,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>${slf4jVersion}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <!-- RSS --> @@ -130,6 +130,11 @@ <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> <!-- librairie topia --> <dependency>