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

r2375 - trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2
by tchemit＠users.nuiton.org 25 Jul '12

25 Jul '12

Author: tchemit Date: 2012-07-25 12:19:38 +0200 (Wed, 25 Jul 2012) New Revision: 2375 Url: http://nuiton.org/repositories/revision/nuiton-utils/2375 Log: fixes #2207: XWork2NuitonValidatorProvider is not windows OS compiliant Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProvider.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProvider.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProvider.java 2012-07-25 10:17:39 UTC (rev 2374) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProvider.java 2012-07-25 10:19:38 UTC (rev 2375) @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.StringUtil; import org.nuiton.validator.AbstractNuitonValidatorProvider; import org.nuiton.validator.NuitonValidator; import org.nuiton.validator.NuitonValidatorModel; @@ -195,7 +196,7 @@ protected File getClassDir(File sourceRoot, Class<?> clazz) { String path = clazz.getPackage().getName(); - path = path.replaceAll("\\.", File.separator); + path = path.replaceAll("\\.", StringUtil.getFileSeparatorRegex()); File dir = new File(sourceRoot, path); return dir; }

1 0

r2374 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by tchemit＠users.nuiton.org 25 Jul '12

25 Jul '12

Author: tchemit Date: 2012-07-25 12:17:39 +0200 (Wed, 25 Jul 2012) New Revision: 2374 Url: http://nuiton.org/repositories/revision/nuiton-utils/2374 Log: refs #2206: Some tests are not windows OS compiliant Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/FileUtilTest.java trunk/nuiton-utils/src/test/java/org/nuiton/util/ResourceTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2012-07-17 13:55:41 UTC (rev 2373) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2012-07-25 10:17:39 UTC (rev 2374) @@ -25,6 +25,8 @@ package org.nuiton.util; +import org.apache.commons.lang3.SystemUtils; + import java.awt.Color; import java.lang.reflect.Field; import java.security.MessageDigest; @@ -754,4 +756,18 @@ return result; } + + /** + * + * @return the file separator escaped for a regex regarding the os used. + */ + public static String getFileSeparatorRegex() { + String result; + if(SystemUtils.IS_OS_WINDOWS) { + result = "\\\\"; + } else { + result = "/"; + } + return result; + } } Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/FileUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/FileUtilTest.java 2012-07-17 13:55:41 UTC (rev 2373) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/FileUtilTest.java 2012-07-25 10:17:39 UTC (rev 2374) @@ -26,9 +26,8 @@ package org.nuiton.util; import org.apache.commons.io.FileUtils; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.*; +import org.junit.rules.TestName; import java.io.File; import java.io.IOException; @@ -41,13 +40,12 @@ * Created: 22 nov. 2004 * * @author Benjamin Poussin <poussin(a)codelutin.com> - * @version $Revision$ - * <p/> - * Mise a jour: $Date$ - * par : */ public class FileUtilTest { // FileUtilTest + @Rule + public final TestName testName = new TestName(); + @Test public void testFind() throws Exception { List<File> result = FileUtil.find(new File("."), ".*FileUtil.*", true); @@ -148,6 +146,8 @@ public void testSedSingleFile() throws IOException { //FIXME tchemit 20100924 Do tests in target, not in /tmp please! + ResourceTest.assumeNotUnderWindows(getClass(), testName); + // try to not make sed in real src dir ;) File testDirectory = FileUtil.createTempDirectory("sed", "test"); FileUtil.copyRecursively(new File("src").getAbsoluteFile(), testDirectory); @@ -185,6 +185,8 @@ //FIXME tchemit 20100924 Do tests in target, not in /tmp please! + ResourceTest.assumeNotUnderWindows(getClass(), testName); + // try to not make sed in real src dir ;) File testDirectory = FileUtil.createTempDirectory("sed", "test"); FileUtil.copyRecursively(new File("src").getAbsoluteFile(), testDirectory); @@ -215,6 +217,8 @@ @Test public void testSedComment() throws IOException { + ResourceTest.assumeNotUnderWindows(getClass(), testName); + // try to not make sed in real src dir ;) File testDirectory = FileUtil.createTempDirectory("sed", "test", parent); FileUtil.copyRecursively(new File("src").getAbsoluteFile(), testDirectory); Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/ResourceTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/ResourceTest.java 2012-07-17 13:55:41 UTC (rev 2373) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/ResourceTest.java 2012-07-25 10:17:39 UTC (rev 2374) @@ -25,13 +25,11 @@ package org.nuiton.util; +import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.*; +import org.junit.rules.TestName; import java.io.File; import java.lang.reflect.Field; @@ -45,10 +43,7 @@ * Test class for {@link Resource}. * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ + * @author tchemit <chemit(a)codelutin.com> */ public class ResourceTest { // ResourceTest @@ -57,15 +52,19 @@ @Test public void testaddDefaultClassLoader() throws Exception { - Assert.assertNull(ResourceTest.class.getResource("/bin/java")); + String javaExecFilename = getJavaExecName(); + Assert.assertNull(ResourceTest.class.getResource("/bin/" + javaExecFilename)); + File repository = new File(System.getProperty("java.home")); Resource.addDefaultClassLoader(repository.toURI().toURL()); - File result = new File(repository, "bin" + File.separator + "java"); + //FIXME-tchemit-2012-07-23 On windows os java does not eixsts but java.exe does + File result = new File(repository, "bin" + File.separator + javaExecFilename); + Assert.assertTrue(result.exists()); - URL resultURL = Resource.getURL("bin/java"); + URL resultURL = Resource.getURL("bin/" + javaExecFilename); Assert.assertEquals(result.toURI().toURL(), resultURL); } @@ -73,24 +72,29 @@ public void testGetURL() throws Exception { URL url; + String javaExecFilename = getJavaExecName(); + url = Resource.getURL("README.txt"); Assert.assertNotNull(url); try { - Resource.getURL("bin/java"); + Resource.getURL("bin/" + javaExecFilename); Assert.fail(); } catch (ResourceNotFoundException e) { Assert.assertTrue(true); } File repository = new File(System.getProperty("java.home")); Resource.addDefaultClassLoader(repository.toURI().toURL()); - url = Resource.getURL("bin/java"); + url = Resource.getURL("bin/" + javaExecFilename); Assert.assertNotNull(url); } @Test public void testGetURLsFromDirectory() throws Exception { + + assumeNotUnderWindows(getClass(), testName); + List<URL> list = new ArrayList<URL>(); File repository = new File(System.getProperty("java.home")); @@ -148,11 +152,14 @@ log.info(Arrays.asList(((URLClassLoader) ClassLoader.getSystemClassLoader()).getURLs())); } + String javaExecFilename = getJavaExecName(); + String fileSeparatorRegex = StringUtil.getFileSeparatorRegex(); File repository = new File(System.getProperty("java.home")); Resource.addDefaultClassLoader(repository.toURI().toURL()); List<URL> result; - result = Resource.getURLs(".*bin/java"); + // comes + result = Resource.getURLs(".*bin" + fileSeparatorRegex + javaExecFilename); Assert.assertNotNull(result); Assert.assertEquals(1, result.size()); @@ -193,6 +200,9 @@ */ @Test public void testGetResourcesJarClassPath() throws Exception { + + assumeNotUnderWindows(getClass(), testName); + // ce test peut echoué a chaque changement dans les dépendances List<URL> urlsPattern = Resource.getResources("org/nuiton/util/Version.*Test\\.class"); List<URL> urlsClass1 = Resource.getResources("org/nuiton/util/VersionTest.class"); @@ -225,6 +235,9 @@ */ @Test public void testGetTestResourcesClassPath() throws Exception { + + assumeNotUnderWindows(getClass(), testName); + URL url1; URL url2; url1 = getClass().getResource("/org/nuiton/util/fileUtilData.txt"); @@ -249,4 +262,24 @@ Assert.assertTrue(urls.contains(url2)); } + protected String getJavaExecName() { + String result; + if (SystemUtils.IS_OS_WINDOWS) { + result = "java.exe"; + } else { + result = "java"; + } + return result; + } + + @Rule + public final TestName testName = new TestName(); + + public static void assumeNotUnderWindows(Class<?> testClass, TestName testName) { + if (SystemUtils.IS_OS_WINDOWS) { + log.warn("This test " + testClass.getName() + "#" + testName.getMethodName() + + " is still not compatible with windows OS"); + Assume.assumeTrue(false); + } + } } // ResourceTest

1 0

r2373 - in trunk: nuiton-profiling nuiton-utils nuiton-validator
by tchemit＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: tchemit Date: 2012-07-17 15:55:41 +0200 (Tue, 17 Jul 2012) New Revision: 2373 Url: http://nuiton.org/repositories/revision/nuiton-utils/2373 Log: remove svn ids from pom Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-07-17 13:43:35 UTC (rev 2372) +++ trunk/nuiton-profiling/pom.xml 2012-07-17 13:55:41 UTC (rev 2373) @@ -2,8 +2,6 @@ <!-- #%L Nuiton Utils :: Nuiton Profiling - $Id$ - $HeadURL$ %% Copyright (C) 2004 - 2010 CodeLutin %% Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-07-17 13:43:35 UTC (rev 2372) +++ trunk/nuiton-utils/pom.xml 2012-07-17 13:55:41 UTC (rev 2373) @@ -2,8 +2,6 @@ <!-- #%L Nuiton Utils :: Nuiton Utils - $Id$ - $HeadURL$ %% Copyright (C) 2004 - 2010 CodeLutin, Tony Chemit %% Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-07-17 13:43:35 UTC (rev 2372) +++ trunk/nuiton-validator/pom.xml 2012-07-17 13:55:41 UTC (rev 2373) @@ -2,8 +2,6 @@ <!-- #%L Nuiton Utils :: Nuiton Validator - $Id$ - $HeadURL$ %% Copyright (C) 2011 CodeLutin, Tony Chemit %%

1 0

r2372 - trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2
by tchemit＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: tchemit Date: 2012-07-17 15:43:35 +0200 (Tue, 17 Jul 2012) New Revision: 2372 Url: http://nuiton.org/repositories/revision/nuiton-utils/2372 Log: fixes #2191: Nuiton validator fail to load since update to xworks 2.3.4 Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java 2012-07-17 13:40:34 UTC (rev 2371) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java 2012-07-17 13:43:35 UTC (rev 2372) @@ -25,12 +25,14 @@ package org.nuiton.validator.xwork2; import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationManager; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; import com.opensymphony.xwork2.validator.ActionValidatorManager; +import com.opensymphony.xwork2.validator.DefaultActionValidatorManager; import com.opensymphony.xwork2.validator.FieldValidator; import com.opensymphony.xwork2.validator.Validator; import org.apache.commons.logging.Log; @@ -125,6 +127,15 @@ ActionValidatorManager validatorManager = container.getInstance(ActionValidatorManager.class, "no-annotations"); + //FIXME-tchemit 2012-07-17 work-around to fix http://nuiton.org/issues/2191 + //FIXME-tchemit 2012-07-17 will remove this when using xworks-core which fixes https://issues.apache.org/jira/browse/WW-3850 + if (validatorManager instanceof DefaultActionValidatorManager) { + + FileManager fileManager = container.getInstance(FileManager.class); + fileManager.setReloadingConfigs(false); + ((DefaultActionValidatorManager) validatorManager).setFileManager(fileManager); + } + return validatorManager; }

1 0

r2371 - trunk
by tchemit＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: tchemit Date: 2012-07-17 15:40:34 +0200 (Tue, 17 Jul 2012) New Revision: 2371 Url: http://nuiton.org/repositories/revision/nuiton-utils/2371 Log: fixes #2193 Updates to xworks-core 2.3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-10 14:59:16 UTC (rev 2370) +++ trunk/pom.xml 2012-07-17 13:40:34 UTC (rev 2371) @@ -54,7 +54,7 @@ <email>bleny(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -66,7 +66,7 @@ <email>poussin(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> <role>Debian packager</role> @@ -79,7 +79,7 @@ <email>chatellier(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -91,7 +91,7 @@ <email>desbois(a)codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -103,7 +103,7 @@ <email>letellier(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -112,10 +112,10 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit(a)codelutin.com</email> + <email>chemit at codelutin dot com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -131,7 +131,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <aspectjVersion>1.6.12</aspectjVersion> - <xworkVersion>2.3.1.2</xworkVersion> + <xworkVersion>2.3.4</xworkVersion> <doxiaVersion>1.3</doxiaVersion>

1 0

r2370 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org 10 Jul '12

10 Jul '12

Author: maven-release Date: 2012-07-10 16:59:16 +0200 (Tue, 10 Jul 2012) New Revision: 2370 Url: http://nuiton.org/repositories/revision/nuiton-utils/2370 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-07-10 14:59:15 UTC (rev 2369) +++ trunk/nuiton-csv/pom.xml 2012-07-10 14:59:16 UTC (rev 2370) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1</version> + <version>2.5.2-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-07-10 14:59:15 UTC (rev 2369) +++ trunk/nuiton-profiling/pom.xml 2012-07-10 14:59:16 UTC (rev 2370) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1</version> + <version>2.5.2-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-07-10 14:59:15 UTC (rev 2369) +++ trunk/nuiton-utils/pom.xml 2012-07-10 14:59:16 UTC (rev 2370) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1</version> + <version>2.5.2-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-07-10 14:59:15 UTC (rev 2369) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-07-10 14:59:16 UTC (rev 2370) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1</version> + <version>2.5.2-SNAPSHOT</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-07-10 14:59:15 UTC (rev 2369) +++ trunk/nuiton-validator/pom.xml 2012-07-10 14:59:16 UTC (rev 2370) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1</version> + <version>2.5.2-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-10 14:59:15 UTC (rev 2369) +++ trunk/pom.xml 2012-07-10 14:59:16 UTC (rev 2370) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1</version> + <version>2.5.2-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -317,12 +317,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.5.1 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.5.1 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <distributionManagement>

1 0

r2369 - in tags: . nuiton-utils-2.5.1
by maven-release＠users.nuiton.org 10 Jul '12

10 Jul '12

Author: maven-release Date: 2012-07-10 16:59:15 +0200 (Tue, 10 Jul 2012) New Revision: 2369 Url: http://nuiton.org/repositories/revision/nuiton-utils/2369 Log: [maven-release-plugin] copy for tag nuiton-utils-2.5.1 Added: tags/nuiton-utils-2.5.1/ Property changes on: tags/nuiton-utils-2.5.1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2368 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org 10 Jul '12

10 Jul '12

Author: maven-release Date: 2012-07-10 16:59:13 +0200 (Tue, 10 Jul 2012) New Revision: 2368 Url: http://nuiton.org/repositories/revision/nuiton-utils/2368 Log: [maven-release-plugin] prepare release nuiton-utils-2.5.1 Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-07-10 12:31:55 UTC (rev 2367) +++ trunk/nuiton-csv/pom.xml 2012-07-10 14:59:13 UTC (rev 2368) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1-SNAPSHOT</version> + <version>2.5.1</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-07-10 12:31:55 UTC (rev 2367) +++ trunk/nuiton-profiling/pom.xml 2012-07-10 14:59:13 UTC (rev 2368) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1-SNAPSHOT</version> + <version>2.5.1</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-07-10 12:31:55 UTC (rev 2367) +++ trunk/nuiton-utils/pom.xml 2012-07-10 14:59:13 UTC (rev 2368) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1-SNAPSHOT</version> + <version>2.5.1</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-07-10 12:31:55 UTC (rev 2367) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-07-10 14:59:13 UTC (rev 2368) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1-SNAPSHOT</version> + <version>2.5.1</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-07-10 12:31:55 UTC (rev 2367) +++ trunk/nuiton-validator/pom.xml 2012-07-10 14:59:13 UTC (rev 2368) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1-SNAPSHOT</version> + <version>2.5.1</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-10 12:31:55 UTC (rev 2367) +++ trunk/pom.xml 2012-07-10 14:59:13 UTC (rev 2368) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.5.1-SNAPSHOT</version> + <version>2.5.1</version> <modules> <module>nuiton-utils</module> @@ -317,12 +317,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.5.1 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.5.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.…</url> </scm> <distributionManagement>

1 0

r2367 - in trunk: nuiton-utils/src/main/java/org/nuiton/util/beans nuiton-utils/src/main/java/org/nuiton/util/converter nuiton-utils/src/test/java/org/nuiton/util/beans nuiton-utils/src/test/resources/zip nuiton-validator/src/main/java/org/nuiton/validator/xwork2
by tchemit＠users.nuiton.org 10 Jul '12

10 Jul '12

Author: tchemit Date: 2012-07-10 14:31:55 +0200 (Tue, 10 Jul 2012) New Revision: 2367 Url: http://nuiton.org/repositories/revision/nuiton-utils/2367 Log: fixes #2178: Can use nested properties in validator field add svn properties + license headers Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanC.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java trunk/nuiton-utils/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java trunk/nuiton-utils/src/test/resources/zip/not-a-zip.zip trunk/nuiton-utils/src/test/resources/zip/this-is-a-zip.zap trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java 2012-07-07 19:44:37 UTC (rev 2366) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java 2012-07-10 12:31:55 UTC (rev 2367) @@ -170,6 +170,81 @@ return result; } + /** + * Obtains all readable properties from a given type. + * + * @param beanType the type to seek + * @return the set of all readable properties for the given type + * @since 2.0 + */ + public static boolean isNestedReadableProperty(Class<?> beanType, String propertyName) { + boolean result = propertyName.contains("."); + if (result) { + int dotIndex = propertyName.indexOf("."); + String firstLevelProperty = propertyName.substring(0, dotIndex); + + Class<?> nestedType = getReadableType(beanType, firstLevelProperty); + if (nestedType == null) { + + result = false; + } else { + + String rest = propertyName.substring(dotIndex+1); + result = isNestedReadableProperty(nestedType, rest); + } + + } else { + + // not a nested property check it directly + Class<?> nestedType = getReadableType(beanType, propertyName); + result = nestedType != null; + } + + return result; + } + + public static Class<?> getReadableType(Class<?> beanType, String propertyName) { + PropertyDescriptor[] descriptors = + PropertyUtils.getPropertyDescriptors(beanType); + + Class<?> result = null; + for (PropertyDescriptor descriptor : descriptors) { + String name = descriptor.getName(); + if (descriptor.getReadMethod() != null && + propertyName.equals(name)) { + result = descriptor.getReadMethod().getReturnType(); + break; + } + } + + if (result == null) { + + // try with super-class + if (beanType.getSuperclass() != null) { + + // get properties fro super-class + result = getReadableType(beanType.getSuperclass(), propertyName); + } + } + + if (result == null) { + + // try it with interfaces + Class<?>[] interfaces = beanType.getInterfaces(); + for (Class<?> anInterface : interfaces) { + + result = getReadableType(anInterface, propertyName); + + if (result != null) { + + // found it + break; + } + } + } + return result; + } + protected static void getReadableProperties(Class<?> beanType, Set<String> result, Set<Class<?>> exploredTypes) { Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java 2012-07-07 19:44:37 UTC (rev 2366) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java 2012-07-10 12:31:55 UTC (rev 2367) @@ -1,8 +1,8 @@ /* * #%L * Nuiton Utils :: Nuiton Utils - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: trunk/nuiton-utils/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanC.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanC.java (rev 0) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanC.java 2012-07-10 12:31:55 UTC (rev 2367) @@ -0,0 +1,108 @@ +package org.nuiton.util.beans; +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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% + */ + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + +/** + * To test http://nuiton.org/issues/2178. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.1 + */ +public class BeanC { + + public static final String PROPERTY_A = "a"; + + public static final String PROPERTY_AA = "aa"; + + public static final String PROPERTY_B = "b"; + + protected BeanA a; + + protected BeanAA aa; + + protected BeanB b; + + protected PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + + public BeanA getA() { + return a; + } + + public void setA(BeanA a) { + Object oldValue = this.a; + this.a = a; + firePropertyChange(PROPERTY_A, oldValue, a); + } + + public BeanAA getAa() { + return aa; + } + + public void setAa(BeanAA aa) { + Object oldValue = this.aa; + this.aa = aa; + firePropertyChange(PROPERTY_AA, oldValue, aa); + } + + public BeanB getB() { + return b; + } + + public void setB(BeanB b) { + Object oldValue = this.b; + this.b = b; + firePropertyChange(PROPERTY_B, oldValue, b); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, + Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + + protected PropertyChangeListener[] getPropertyChangeListeners() { + return pcs.getPropertyChangeListeners(); + } +} Property changes on: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanC.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java 2012-07-07 19:44:37 UTC (rev 2366) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java 2012-07-10 12:31:55 UTC (rev 2367) @@ -116,6 +116,56 @@ } @Test + public void getNestedReadeableProperty() { + + assertFoundNestedReadableProperties(BeanA.class, + BeanA.PROPERTY_A, + BeanA.PROPERTY_B, + BeanA.PROPERTY_C, + BeanA.PROPERTY_D, + BeanA.PROPERTY_E, + BeanA.PROPERTY_F); + + assertFoundNestedReadableProperties(BeanB.class, + BeanA.PROPERTY_A, + BeanA.PROPERTY_B, + BeanA.PROPERTY_C, + BeanA.PROPERTY_D, + BeanA.PROPERTY_E, + BeanA.PROPERTY_F, + BeanB.PROPERTY_BB, + BeanB.PROPERTY_A2, + BeanB.PROPERTY_B2, + BeanB.PROPERTY_C2, + BeanB.PROPERTY_D2, + BeanB.PROPERTY_E2, + BeanB.PROPERTY_F2 + ); + + assertFoundNestedReadableProperties(BeanC.class, + BeanC.PROPERTY_A, + BeanC.PROPERTY_AA, + BeanC.PROPERTY_B, + BeanC.PROPERTY_A + "." + BeanA.PROPERTY_A, + BeanC.PROPERTY_A + "." + BeanA.PROPERTY_A, + BeanC.PROPERTY_A + "." + BeanA.PROPERTY_B, + BeanC.PROPERTY_A + "." + BeanA.PROPERTY_C, + BeanC.PROPERTY_A + "." + BeanA.PROPERTY_D, + BeanC.PROPERTY_A + "." + BeanA.PROPERTY_E, + BeanC.PROPERTY_A + "." + BeanA.PROPERTY_F, + BeanC.PROPERTY_B + "." + BeanB.PROPERTY_BB, + BeanC.PROPERTY_B + "." + BeanB.PROPERTY_A2, + BeanC.PROPERTY_B + "." + BeanB.PROPERTY_B2, + BeanC.PROPERTY_B + "." + BeanB.PROPERTY_C2, + BeanC.PROPERTY_B + "." + BeanB.PROPERTY_D2, + BeanC.PROPERTY_B + "." + BeanB.PROPERTY_E2, + BeanC.PROPERTY_B + "." + BeanB.PROPERTY_F2, + BeanC.PROPERTY_B + "." + BeanB.PROPERTY_A2 + ".class" + + ); + } + + @Test public void addPropertyChangeListener() throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { PropertyChangeListener l = new BeanContextSupport(); @@ -176,4 +226,11 @@ Assert.assertTrue(readableProperties.contains(expectedproperty)); } } + + protected void assertFoundNestedReadableProperties(Class<?> type, String... expectedproperties) { + for (String expectedproperty : expectedproperties) { + boolean actual = BeanUtil.isNestedReadableProperty(type, expectedproperty); + Assert.assertTrue("Did not found nested property " + expectedproperty, actual); + } + } } Property changes on: trunk/nuiton-utils/src/test/resources/zip/not-a-zip.zip ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-utils/src/test/resources/zip/this-is-a-zip.zap ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java 2012-07-07 19:44:37 UTC (rev 2366) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java 2012-07-10 12:31:55 UTC (rev 2367) @@ -77,40 +77,25 @@ ConfigurationManager confManager = new ConfigurationManager(); Configuration conf = confManager.getConfiguration(); Container container = conf.getContainer(); - ValueStackFactory stackFactory = - container.getInstance(ValueStackFactory.class); + ValueStackFactory stackFactory = container.getInstance(ValueStackFactory.class); ValueStack vs = stackFactory.createValueStack(); return vs; } - public static <O> XWork2ScopeValidator<O> newXWorkScopeValidator(Class<O> beanClass, - String contextName, - Set<String> fields - ) { - return newXWorkScopeValidator(beanClass, - contextName, - fields, - getSharedValueStack() - ); + public static <O> XWork2ScopeValidator<O> newXWorkScopeValidator(Class<O> beanClass, String contextName, + Set<String> fields) { + return newXWorkScopeValidator(beanClass, contextName, fields, getSharedValueStack()); } - public static <O> XWork2ScopeValidator<O> newXWorkScopeValidator(Class<O> beanClass, - String contextName, - Set<String> fields, - ValueStack vs) { + public static <O> XWork2ScopeValidator<O> newXWorkScopeValidator(Class<O> beanClass, String contextName, + Set<String> fields, ValueStack vs) { - return new XWork2ScopeValidator<O>(beanClass, - contextName, - fields, - vs - ); + return new XWork2ScopeValidator<O>(beanClass, contextName, fields, vs); } - public static String getContextForScope(String context, - NuitonValidatorScope scope) { - return (context == null ? "" : context + "-") + - scope.name().toLowerCase(); + public static String getContextForScope(String context, NuitonValidatorScope scope) { + return (context == null ? "" : context + "-") + scope.name().toLowerCase(); } protected static ActionValidatorManager newValidationManager(ValueStack vs) { @@ -138,17 +123,14 @@ // init validator Container container = context.getContainer(); ActionValidatorManager validatorManager = - container.getInstance(ActionValidatorManager.class, - "no-annotations"); + container.getInstance(ActionValidatorManager.class, "no-annotations"); return validatorManager; } - public static <O> Map<NuitonValidatorScope, String[]> detectFields(Class<O> type, - String context, + public static <O> Map<NuitonValidatorScope, String[]> detectFields(Class<O> type, String context, NuitonValidatorScope[] scopeUniverse) { - Set<String> availableFields = BeanUtil.getReadableProperties(type); ActionValidatorManager validatorManager = newValidationManager(null); @@ -157,13 +139,8 @@ for (NuitonValidatorScope scope : scopeUniverse) { - Set<String> fieldNames = detectFieldsForScope(validatorManager, - type, - scope, - context, - availableFields, - false - ); + Set<String> fieldNames = + detectFieldsForScope(validatorManager, type, scope, context, availableFields, false); if (log.isDebugEnabled()) { log.debug("detected validator fields for scope " + scope + @@ -174,9 +151,7 @@ // fields detected in this validator, keep it - fields.put(scope, - fieldNames.toArray(new String[fieldNames.size()]) - ); + fields.put(scope, fieldNames.toArray(new String[fieldNames.size()])); } } @@ -193,7 +168,6 @@ String scopeContext = getContextForScope(context, scope); - Set<String> fields = new HashSet<String>(); int skip = 0; @@ -227,12 +201,20 @@ fields.add(fName); } else { - // not a readable property, can not add it - String message = "Field " + fName + " in scope [" + scopeContext + "] is not a readable property of " + type.getName(); - if (log.isErrorEnabled()) { - log.error(message); + if (BeanUtil.isNestedReadableProperty(type, fName)) { + + fields.add(fName); + + } else { + // not a readable property, can not add it + String message = + "Field " + fName + " in scope [" + scopeContext + "] is not a readable property of " + + type.getName(); + if (log.isErrorEnabled()) { + log.error(message); + } + throw new IllegalStateException(message); } - throw new IllegalStateException(message); } } }

1 0

r2366 - trunk
by tchemit＠users.nuiton.org 07 Jul '12

07 Jul '12

Author: tchemit Date: 2012-07-07 21:44:37 +0200 (Sat, 07 Jul 2012) New Revision: 2366 Url: http://nuiton.org/repositories/revision/nuiton-utils/2366 Log: updates to mavenpom 3.3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-06 10:07:04 UTC (rev 2365) +++ trunk/pom.xml 2012-07-07 19:44:37 UTC (rev 2366) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0