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

r1865 - trunk/src/site/apt
by echatellier＠users.nuiton.org 18 May '10

18 May '10

Author: echatellier Date: 2010-05-18 17:39:59 +0200 (Tue, 18 May 2010) New Revision: 1865 Url: http://nuiton.org/repositories/revision/nuiton-utils/1865 Log: Revert previous commit : aggregate version is the one to use Modified: trunk/src/site/apt/Warlauncher.apt Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2010-05-18 15:39:45 UTC (rev 1864) +++ trunk/src/site/apt/Warlauncher.apt 2010-05-18 15:39:59 UTC (rev 1865) @@ -123,7 +123,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> + <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> <version>7.1.0.v20100505</version> <scope>provided</scope>

1 0

r1864 - in trunk: . src/site/apt
by echatellier＠users.nuiton.org 18 May '10

18 May '10

Author: echatellier Date: 2010-05-18 17:39:45 +0200 (Tue, 18 May 2010) New Revision: 1864 Url: http://nuiton.org/repositories/revision/nuiton-utils/1864 Log: Revert previous commit : aggregate version is the one to use Modified: trunk/pom.xml trunk/src/site/apt/Warlauncher.apt Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-18 13:47:14 UTC (rev 1863) +++ trunk/pom.xml 2010-05-18 15:39:45 UTC (rev 1864) @@ -97,7 +97,7 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> + <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> <version>7.1.0.v20100505</version> <scope>provided</scope> Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2010-05-18 13:47:14 UTC (rev 1863) +++ trunk/src/site/apt/Warlauncher.apt 2010-05-18 15:39:45 UTC (rev 1864) @@ -160,7 +160,7 @@ </includes> </overlay> <overlay> - <groupId>org.eclipse.jetty</groupId> + <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> <type>jar</type> </overlay>

1 0

r1863 - in trunk: . src/site/apt
by echatellier＠users.nuiton.org 18 May '10

18 May '10

Author: echatellier Date: 2010-05-18 15:47:14 +0200 (Tue, 18 May 2010) New Revision: 1863 Url: http://nuiton.org/repositories/revision/nuiton-utils/1863 Log: org.eclipse.jetty:jetty-webapp seam to work better then org.eclipse.jetty.aggregate:jetty-webapp Modified: trunk/pom.xml trunk/src/site/apt/Warlauncher.apt Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-17 08:57:34 UTC (rev 1862) +++ trunk/pom.xml 2010-05-18 13:47:14 UTC (rev 1863) @@ -97,7 +97,7 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> <version>7.1.0.v20100505</version> <scope>provided</scope> Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2010-05-17 08:57:34 UTC (rev 1862) +++ trunk/src/site/apt/Warlauncher.apt 2010-05-18 13:47:14 UTC (rev 1863) @@ -59,7 +59,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.1.2</version> + <version>1.3</version> <scope>provided</scope> </dependency> <dependency> @@ -119,13 +119,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.1.2</version> + <version>1.3</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>7.0.1.v20091125</version> + <version>7.1.0.v20100505</version> <scope>provided</scope> </dependency> <dependency> @@ -160,7 +160,7 @@ </includes> </overlay> <overlay> - <groupId>org.eclipse.jetty.aggregate</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> <type>jar</type> </overlay>

1 0

r1862 - trunk
by echatellier＠users.nuiton.org 17 May '10

17 May '10

Author: echatellier Date: 2010-05-17 10:57:34 +0200 (Mon, 17 May 2010) New Revision: 1862 Url: http://nuiton.org/repositories/revision/nuiton-utils/1862 Log: Update to jetty 7.1.0.v20100505 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-12 20:16:51 UTC (rev 1861) +++ trunk/pom.xml 2010-05-17 08:57:34 UTC (rev 1862) @@ -99,7 +99,7 @@ <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> - <version>7.0.1.v20091125</version> + <version>7.1.0.v20100505</version> <scope>provided</scope> </dependency>

1 0

r1861 - in trunk/src: main/java/org/nuiton/util/beans test/java/org/nuiton/util/beans
by fdesbois＠users.nuiton.org 12 May '10

12 May '10

Author: fdesbois Date: 2010-05-12 22:16:51 +0200 (Wed, 12 May 2010) New Revision: 1861 Url: http://nuiton.org/repositories/revision/nuiton-utils/1861 Log: Evo #605 : add copyExcluding method in Binder Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java trunk/src/test/java/org/nuiton/util/beans/BinderTest.java Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-05-11 14:42:58 UTC (rev 1860) +++ trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-05-12 20:16:51 UTC (rev 1861) @@ -33,9 +33,11 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -192,7 +194,8 @@ /** * Copy properties from a source bean to a destination one according to - * the model of the binder. + * the model of the binder. If {@code propertyNames} is defined, only + * those properties will be copied. * * Note: If {@code from} object is null, then {@code null} values * will be set to mapped properties into {@code dst} @@ -204,13 +207,53 @@ * binder) * @throws NullPointerException if target parameter is {@code null} */ - public void copy(I source, O target, String... propertyNames) + public void copy(I source, O target, String... propertyNames) { + copy(source, target, false, propertyNames); + } + + /** + * Copy properties from a source bean to a destination one according to + * the model of the binder excluding {@code propertyNames}. + * + * Note: If {@code from} object is null, then {@code null} values + * will be set to mapped properties into {@code dst}. + * + * @param source the bean to read + * @param target the bean to write + * @param propertyNames optional subset of properties to copy (if none is + * specifed, will use all the properties defined in + * binder) + * @throws NullPointerException if target parameter is {@code null} + */ + public void copyExcluding(I source, O target, String... propertyNames) { + copy(source, target, true, propertyNames); + } + + /** + * Copy properties from a source bean to a destination one according to + * the model of the binder. + * + * Note: If {@code from} object is null, then {@code null} values + * will be set to mapped properties into {@code dst}. + * + * @param source the bean to read + * @param target the bean to write + * @param excludeProperties true to exclude following {@code propertyNames} + * @param propertyNames optional subset of properties to copy (if none is + * specifed, will use all the properties defined in + * binder) + * @throws NullPointerException if target parameter is {@code null} + */ + protected void copy(I source, O target, boolean excludeProperties, + String... propertyNames) throws NullPointerException { if (target == null) { throw new NullPointerException("parameter 'target' can no be null"); } - propertyNames = getProperties(propertyNames); + propertyNames = excludeProperties ? + getAllPropertiesExclude(propertyNames) : + getProperties(propertyNames); for (String sourceProperty : propertyNames) { @@ -306,6 +349,24 @@ return propertyNames; } + /** + * Obtains all properties from binder's model except those {@code + * propertyNameExcludes}. Unknown properties will be ignored. + * + * @param propertyNameExcludes name of properties to exclude + * @return the array of property names without those in argument + */ + protected String[] getAllPropertiesExclude(String... propertyNameExcludes) { + List<String> excludes = Arrays.asList(propertyNameExcludes); + List<String> results = new ArrayList<String>(); + for (String propertyName : model.getSourceDescriptors()) { + if (!excludes.contains(propertyName)) { + results.add(propertyName); + } + } + return results.toArray(new String[results.size()]); + } + protected Object getCollectionValue(String sourceProperty, Object readValue) { CollectionStrategy strategy = model.getCollectionStrategy(sourceProperty); Modified: trunk/src/test/java/org/nuiton/util/beans/BinderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/beans/BinderTest.java 2010-05-11 14:42:58 UTC (rev 1860) +++ trunk/src/test/java/org/nuiton/util/beans/BinderTest.java 2010-05-12 20:16:51 UTC (rev 1861) @@ -148,4 +148,41 @@ Assert.assertEquals(0,b.getE2()); } + + @Test + public void testCopyExcluding() throws Exception { + + a.setA(VALUE_A); + a.setB(VALUE_B); + a.setC(VALUE_C); + a.setE(VALUE_E); + + // #1 : Copy all properties defined by binderB instead of PROPERTY_A + binderB.copyExcluding(a, b, BeanA.PROPERTY_A); + Assert.assertNull(b.getA()); + // same result as copy + Assert.assertEquals(VALUE_B, b.getB()); + Assert.assertNull(b.getC()); + Assert.assertEquals(VALUE_C, b.getC2()); + Assert.assertEquals(VALUE_E, b.getE2()); + + // #2 : Copy all properties : same as binderB.copy(a, b); + binderB.copyExcluding(a, b); + // same result as copy + Assert.assertEquals(VALUE_A, b.getA()); + Assert.assertEquals(VALUE_B, b.getB()); + Assert.assertNull(b.getC()); + Assert.assertEquals(VALUE_C, b.getC2()); + Assert.assertEquals(VALUE_E, b.getE2()); + + // #3 : Copy all properties, excluding one is not considered from source + binderB.copyExcluding(a, b, BeanB.PROPERTY_C2); + // same result as copy + Assert.assertEquals(VALUE_A, b.getA()); + Assert.assertEquals(VALUE_B, b.getB()); + Assert.assertNull(b.getC()); + Assert.assertEquals(VALUE_C, b.getC2()); + Assert.assertEquals(VALUE_E, b.getE2()); + + } }

1 0

r1860 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 11 May '10

11 May '10

Author: echatellier Date: 2010-05-11 16:42:58 +0200 (Tue, 11 May 2010) New Revision: 1860 Url: http://nuiton.org/repositories/revision/nuiton-utils/1860 Log: fix #601 : file.toURI seam to encode better file path Modified: trunk/src/main/java/org/nuiton/util/Resource.java Modified: trunk/src/main/java/org/nuiton/util/Resource.java =================================================================== --- trunk/src/main/java/org/nuiton/util/Resource.java 2010-05-11 11:53:05 UTC (rev 1859) +++ trunk/src/main/java/org/nuiton/util/Resource.java 2010-05-11 14:42:58 UTC (rev 1860) @@ -328,12 +328,28 @@ } for (URL urlFile : arrayURL) { - String fileName = urlFile.getFile(); + // EC-20100510 this cause wrong accent encoding + //String fileName = urlFile.getFile(); + String fileName = null; + try { + fileName = urlFile.toURI().getPath(); + } + catch (Exception e) { + if (log.isWarnEnabled()) { + log.warn(e); + } + // warning, this can cause wrong encoding !!! + fileName = urlFile.getFile(); + } + // TODO deal with encoding in windows, this is very durty, but it // works... File file = new File(fileName.replaceAll("%20", " ")); if (!file.exists()) { // this case should not appear + if (log.isDebugEnabled()) { + log.debug("Can't find file " + file + " (" + fileName + ")"); + } continue; } if (isJar(fileName)) {

1 0

r1859 - trunk
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:53:05 +0200 (Tue, 11 May 2010) New Revision: 1859 Url: http://nuiton.org/repositories/revision/nuiton-utils/1859 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 11:53:04 UTC (rev 1858) +++ trunk/pom.xml 2010-05-11 11:53:05 UTC (rev 1859) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.3</version> + <version>1.3.1-SNAPSHOT</version> <dependencies> @@ -161,9 +161,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.3</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <profiles>

1 0

r1858 - in tags: . nuiton-utils-1.3
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:53:04 +0200 (Tue, 11 May 2010) New Revision: 1858 Url: http://nuiton.org/repositories/revision/nuiton-utils/1858 Log: [maven-release-plugin] copy for tag nuiton-utils-1.3 Added: tags/nuiton-utils-1.3/ Property changes on: tags/nuiton-utils-1.3 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0

r1857 - trunk
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:53:02 +0200 (Tue, 11 May 2010) New Revision: 1857 Url: http://nuiton.org/repositories/revision/nuiton-utils/1857 Log: [maven-release-plugin] prepare release nuiton-utils-1.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 11:49:31 UTC (rev 1856) +++ trunk/pom.xml 2010-05-11 11:53:02 UTC (rev 1857) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <dependencies> @@ -161,9 +161,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.3</url> </scm> <profiles>

1 0

r1856 - trunk
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:49:31 +0200 (Tue, 11 May 2010) New Revision: 1856 Url: http://nuiton.org/repositories/revision/nuiton-utils/1856 Log: Evolution #597: Use provided log4j (need to specify it in final application) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 11:39:18 UTC (rev 1855) +++ trunk/pom.xml 2010-05-11 11:49:31 UTC (rev 1856) @@ -45,10 +45,7 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> -  - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency>

1 0