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

r2534 - in trunk: . nuiton-config nuiton-csv nuiton-updater nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org March 18, 2013

March 18, 2013

Author: maven-release Date: 2013-03-18 07:30:06 +0100 (Mon, 18 Mar 2013) New Revision: 2534 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2534 Log: [maven-release-plugin] prepare release nuiton-utils-2.6.11 Modified: trunk/nuiton-config/pom.xml trunk/nuiton-csv/pom.xml trunk/nuiton-updater/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-config/pom.xml =================================================================== --- trunk/nuiton-config/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-config/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-config</artifactId> Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-csv/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-updater/pom.xml =================================================================== --- trunk/nuiton-updater/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-updater/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-updater</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-utils/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-validator/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> <modules> <module>nuiton-utils</module> @@ -333,12 +333,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.6.11 </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.6.11 </developerConnection> - <url>http://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-utils-2…</url> </scm> <distributionManagement>

1 0

r2533 - in trunk/nuiton-csv/src: main/java/org/nuiton/util/csv main/java/org/nuiton/util/csv/ext test/java/org/nuiton/util/csv
by kmorin＠users.nuiton.org March 15, 2013

March 15, 2013

Author: kmorin Date: 2013-03-15 14:43:12 +0100 (Fri, 15 Mar 2013) New Revision: 2533 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2533 Log: fixes #2601 add a method to create a new optional column Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Column.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Column.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Column.java 2013-03-15 12:43:07 UTC (rev 2532) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Column.java 2013-03-15 13:43:12 UTC (rev 2533) @@ -44,20 +44,23 @@ valueFormatter, null, null, - ignored + ignored, + !ignored ); } public static <E, T> Column<E, T> newImportableColumn(String headerName, ValueParser<T> valueParser, ValueSetter<E, T> valueSetter, - boolean ignored) { + boolean ignored, + boolean mandatory) { return new Column<E, T>(headerName, null, null, valueParser, valueSetter, - ignored + ignored, + mandatory ); } @@ -72,7 +75,8 @@ valueFormatter, valueParser, valueSetter, - ignored + ignored, + !ignored ); } @@ -108,14 +112,15 @@ ValueFormatter<T> valueFormatter, ValueParser<T> valueParser, ValueSetter<E, T> valueSetter, - boolean ignored) { + boolean ignored, + boolean mandatory) { this.headerName = headerName; this.valueGetter = valueGetter; this.valueFormatter = valueFormatter; this.valueSetter = valueSetter; this.valueParser = valueParser; this.ignored = ignored; - mandatory = !ignored; + this.mandatory = mandatory; } @Override Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java 2013-03-15 12:43:07 UTC (rev 2532) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java 2013-03-15 13:43:12 UTC (rev 2533) @@ -43,7 +43,7 @@ new LinkedList<ExportableColumn<E, ?>>(); public <T> ImportableColumn<E, T> newIgnoredColumn(String headerName) { - Column<E, T> newColumn = Column.newImportableColumn(headerName, null, null, true); + Column<E, T> newColumn = Column.newImportableColumn(headerName, null, null, true, false); columnsForImport.add(newColumn); return newColumn; } @@ -61,11 +61,29 @@ } public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, ValueParser<T> valueParser, ValueSetter<E, T> valueSetter) { - Column<E, T> newColumn = Column.newImportableColumn(headerName, valueParser, valueSetter, false); + Column<E, T> newColumn = Column.newImportableColumn(headerName, valueParser, valueSetter, false, true); columnsForImport.add(newColumn); return newColumn; } + public ImportableColumn<E, String> newOptionalColumn(String headerName, String propertyName) { + return newOptionalColumn(headerName, propertyName, Common.STRING); + } + + public <T> ImportableColumn<E, T> newOptionalColumn(String headerName, String propertyName, ValueParser<T> valueParser) { + return newOptionalColumn(headerName, valueParser, new Common.BeanProperty<E, T>(propertyName)); + } + + public ImportableColumn<E, String> newOptionalColumn(String headerName, ValueSetter<E, String> valueSetter) { + return newOptionalColumn(headerName, Common.STRING, valueSetter); + } + + public <T> ImportableColumn<E, T> newOptionalColumn(String headerName, ValueParser<T> valueParser, ValueSetter<E, T> valueSetter) { + Column<E, T> newColumn = Column.newImportableColumn(headerName, valueParser, valueSetter, false, false); + columnsForImport.add(newColumn); + return newColumn; + } + public ExportableColumn<E, String> newColumnForExport(String headerName, String propertyName) { return newColumnForExport(headerName, propertyName, Common.STRING); } Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java 2013-03-15 12:43:07 UTC (rev 2532) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java 2013-03-15 13:43:12 UTC (rev 2533) @@ -64,7 +64,7 @@ } public ChooseExportStrategyForColumnStep<E> ignoreAtImport() { - Column<E, Object> importableColumn = Column.newImportableColumn(columnName, null, null, true); + Column<E, Object> importableColumn = Column.newImportableColumn(columnName, null, null, true, false); return new ChooseExportStrategyForColumnStep(columnName, importableColumn); } @@ -81,7 +81,7 @@ } public <T> ChooseExportStrategyForColumnStep<E> mandatoryAtImport(ValueParser<T> valueParser, ValueSetter<E, T> valueSetter) { - Column<E, T> importableColumn = Column.newImportableColumn(columnName, valueParser, valueSetter, false); + Column<E, T> importableColumn = Column.newImportableColumn(columnName, valueParser, valueSetter, false, true); return new ChooseExportStrategyForColumnStep(columnName, importableColumn); } @@ -98,8 +98,7 @@ } public <T> ChooseExportStrategyForColumnStep<E> optionalAtImport(ValueParser<T> valueParser, ValueSetter<E, T> valueSetter) { - // FIXME 20111225 ici comme la colonne est optionnel elle est simplement ignorée, lacune - Column<E, T> importableColumn = Column.newImportableColumn(columnName, valueParser, valueSetter, false); + Column<E, T> importableColumn = Column.newImportableColumn(columnName, valueParser, valueSetter, false, true); return new ChooseExportStrategyForColumnStep(columnName, importableColumn); } Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java 2013-03-15 12:43:07 UTC (rev 2532) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java 2013-03-15 13:43:12 UTC (rev 2533) @@ -103,6 +103,30 @@ return modelBuilder.newMandatoryColumn(headerName, valueParser, etValueSetter); } + public ImportableColumn<E, String> newOptionalColumn(String headerName) { + return modelBuilder.newOptionalColumn(headerName, headerName); + } + + public ImportableColumn<E, String> newOptionalColumn(String headerName, String propertyName) { + return modelBuilder.newOptionalColumn(headerName, propertyName); + } + + public <T> ImportableColumn<E, T> newOptionalColumn(String headerName, ValueParser<T> valueParser) { + return modelBuilder.newOptionalColumn(headerName, headerName, valueParser); + } + + public <T> ImportableColumn<E, T> newOptionalColumn(String headerName, String propertyName, ValueParser<T> valueParser) { + return modelBuilder.newOptionalColumn(headerName, propertyName, valueParser); + } + + public ImportableColumn<E, String> newOptionalColumn(String headerName, ValueSetter<E, String> eStringValueSetter) { + return modelBuilder.newOptionalColumn(headerName, eStringValueSetter); + } + + public <T> ImportableColumn<E, T> newOptionalColumn(String headerName, ValueParser<T> valueParser, ValueSetter<E, T> etValueSetter) { + return modelBuilder.newOptionalColumn(headerName, valueParser, etValueSetter); + } + public ExportableColumn<E, String> newColumnForExport(String headerName) { return modelBuilder.newColumnForExport(headerName, headerName); } Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java 2013-03-15 12:43:07 UTC (rev 2532) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java 2013-03-15 13:43:12 UTC (rev 2533) @@ -166,7 +166,8 @@ "TITLE", Common.STRING, withBeanSetter("title", String.class), - false + false, + true ); } @@ -175,7 +176,8 @@ "DATE", withDateParser(), withBeanSetter("date", Date.class), - false + false, + true ); } @@ -184,7 +186,8 @@ "NUMBER", Common.INTEGER, withBeanSetter("number", Integer.class), - false + false, + true ); } @@ -193,7 +196,8 @@ "ROWBEANENUM", Common.newEnumByOrdinalParserFormatter(RowBeanEnum.class), withBeanSetter("rowBeanEnum", RowBeanEnum.class), - false + false, + true ); } @SuppressWarnings({"UnusedParameters"})

1 0

r2532 - trunk/nuiton-config/src/main/java/org/nuiton/util/config
by tchemit＠users.nuiton.org March 15, 2013

March 15, 2013

Author: tchemit Date: 2013-03-15 13:43:07 +0100 (Fri, 15 Mar 2013) New Revision: 2532 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2532 Log: fixes #2600: [ApplicationConfig] Add more methods on ApplicationConfigHelper Modified: trunk/nuiton-config/src/main/java/org/nuiton/util/config/ApplicationConfigHelper.java Modified: trunk/nuiton-config/src/main/java/org/nuiton/util/config/ApplicationConfigHelper.java =================================================================== --- trunk/nuiton-config/src/main/java/org/nuiton/util/config/ApplicationConfigHelper.java 2013-03-13 13:48:55 UTC (rev 2531) +++ trunk/nuiton-config/src/main/java/org/nuiton/util/config/ApplicationConfigHelper.java 2013-03-15 12:43:07 UTC (rev 2532) @@ -191,16 +191,53 @@ * @return the set of options key not to store in the config file * @see ConfigOptionDef#isFinal() * @see ConfigOptionDef#isTransient() - * @since 2.6.7 + * @since 2.6.11 */ public static Set<String> getTransientOrFinalOptionKey(Set<ApplicationConfigProvider> providers) { Set<String> result = new HashSet<String>(); - for (ConfigOptionDef def : getTransientOptions(providers)) { - result.add(def.getKey()); + result.addAll(getTransientOptionKeys(providers)); + result.addAll(getFinalOptionKeys(providers)); + return result; + } + + /** + * Gets all transient options keys from the given providers. + * + * @param providers providers to inspect + * @return the set of all options key that are transient + * @see ConfigOptionDef#isTransient() + * @since 2.6.11 + */ + public static Set<String> getTransientOptionKeys(Set<ApplicationConfigProvider> providers) { + Set<String> result = new HashSet<String>(); + for (ApplicationConfigProvider provider : providers) { + for (ConfigOptionDef def : provider.getOptions()) { + if (def.isTransient()) { + result.add(def.getKey()); + } + } } - for (ConfigOptionDef def : getFinalOptions(providers)) { - result.add(def.getKey()); + return result; + } + + /** + * Gets all final options keys from the given providers. + * + * @param providers providers to inspect + * @return the set of all options keys that are final + * @see ConfigOptionDef#isTransient() + * @since 2.6.7 + */ + public static Set<String> getFinalOptionKeys(Set<ApplicationConfigProvider> providers) { + Set<String> result = new HashSet<String>(); + for (ApplicationConfigProvider provider : providers) { + for (ConfigOptionDef def : provider.getOptions()) { + if (def.isFinal()) { + result.add(def.getKey()); + } + } } return result; } + }

1 0

r2531 - trunk/nuiton-utils/src/test/java/org/nuiton/util/beans
by bleny＠users.nuiton.org March 13, 2013

March 13, 2013

Author: bleny Date: 2013-03-13 14:48:55 +0100 (Wed, 13 Mar 2013) New Revision: 2531 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2531 Log: refs #2587 fix implementation of IS_WRITE_DESCRIPTOR predicate in BeanUtil and fix tests Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java 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 2013-03-13 13:40:33 UTC (rev 2530) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java 2013-03-13 13:48:55 UTC (rev 2531) @@ -123,6 +123,7 @@ assertFoundDescriptors(BeanA.class, BeanUtil.IS_WRITE_DESCRIPTOR, + BeanA.PROPERTY_AA, BeanA.PROPERTY_A, BeanA.PROPERTY_B, BeanA.PROPERTY_C, @@ -132,13 +133,13 @@ assertFoundDescriptors(BeanB.class, BeanUtil.IS_WRITE_DESCRIPTOR, + BeanA.PROPERTY_AA, 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,

1 0

r2530 - trunk/nuiton-utils/src/main/java/org/nuiton/util/beans
by bleny＠users.nuiton.org March 13, 2013

March 13, 2013

Author: bleny Date: 2013-03-13 14:40:33 +0100 (Wed, 13 Mar 2013) New Revision: 2530 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2530 Log: refs #2587 fix implementation of IS_WRITE_DESCRIPTOR predicate in BeanUtil Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.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 2013-03-13 13:39:11 UTC (rev 2529) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java 2013-03-13 13:40:33 UTC (rev 2530) @@ -76,7 +76,7 @@ public static final Predicate<PropertyDescriptor> IS_WRITE_DESCRIPTOR = new Predicate<PropertyDescriptor>() { @Override public boolean apply(PropertyDescriptor input) { - return input.getReadMethod() != null; + return input.getWriteMethod() != null; } };

1 0

r2529 - trunk
by bleny＠users.nuiton.org March 13, 2013

March 13, 2013

Author: bleny Date: 2013-03-13 14:39:11 +0100 (Wed, 13 Mar 2013) New Revision: 2529 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2529 Log: add .idea to svn:ignore Modified: trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir .idea

1 0

r2528 - trunk/nuiton-updater/src/main/java/org/nuiton/util/updater
by tchemit＠users.nuiton.org March 12, 2013

March 12, 2013

Author: tchemit Date: 2013-03-13 00:03:34 +0100 (Wed, 13 Mar 2013) New Revision: 2528 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2528 Log: fixes #2547: Add a progression model when downloading the update fixes #2590: Improve download api Added: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/DownloadMonitor.java trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateInvalidArchiveLayoutException.java trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateNotFoundException.java Modified: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationInfo.java trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java Modified: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationInfo.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationInfo.java 2013-03-12 16:07:04 UTC (rev 2527) +++ trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationInfo.java 2013-03-12 23:03:34 UTC (rev 2528) @@ -25,6 +25,7 @@ */ import java.io.File; +import java.io.Serializable; /** * TODO @@ -33,8 +34,10 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.7 */ -public class ApplicationInfo { +public class ApplicationInfo implements Serializable { + private static final long serialVersionUID = 1L; + public String name; public String oldVersion; Modified: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java 2013-03-12 16:07:04 UTC (rev 2527) +++ trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java 2013-03-12 23:03:34 UTC (rev 2528) @@ -25,6 +25,7 @@ */ import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,14 +36,15 @@ import org.apache.commons.vfs2.FileSystemOptions; import org.apache.commons.vfs2.VFS; import org.apache.commons.vfs2.provider.http.HttpFileSystemConfigBuilder; +import org.nuiton.util.VersionUtil; import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.config.ArgumentsParserException; -import org.nuiton.util.VersionUtil; import java.io.BufferedInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -134,18 +136,20 @@ final static private String SEPARATOR_KEY = "."; - public static final String HTTP_PROXY = "http_proxy"; + public static final String HTTP_PROXY = "http_proxy"; - public static final String URL_KEY = "url"; + public static final String URL_KEY = "url"; - public static final String AUTHENTICATION_KEY = "auth"; + public static final String AUTHENTICATION_KEY = "auth"; - public static final String VERSION_KEY = "version"; + public static final String VERSION_KEY = "version"; - public static final String VERSION_FILE = "version.appup"; + public static final String VERSION_FILE = "version.appup"; protected ApplicationConfig config; + protected DownloadMonitor downloadMonitor; + /** Utilise le fichier de configuration par defaut: ApplicationUpdater.properties */ public ApplicationUpdater() { this(null); @@ -170,6 +174,9 @@ this.config = config; } + public void setDownloadMonitor(DownloadMonitor downloadMonitor) { + this.downloadMonitor = downloadMonitor; + } /** * @param url url where properties file is downloadable. This properties @@ -184,7 +191,7 @@ File destDir, boolean async, ApplicationUpdaterCallback callback) { - Updater up = new Updater(config, url, currentDir, destDir, callback); + Updater up = new Updater(config, url, currentDir, destDir, downloadMonitor, callback); if (async) { Thread thread = new Thread(up, ApplicationUpdater.class.getSimpleName()); thread.start(); @@ -193,6 +200,11 @@ } } + public static void createVersionFile(File dir, String version) throws IOException { + File versionFile = new File(dir, VERSION_FILE); + FileUtils.writeStringToFile(versionFile, version); + } + /** * La classe ou le travail est reellement fait, peut-etre appeler dans * un thread si necessaire. @@ -209,15 +221,19 @@ protected ApplicationUpdaterCallback callback; + protected DownloadMonitor downloadMonitor; + public Updater(ApplicationConfig config, String vfsPropertiesUrl, File currentDir, File destDir, + DownloadMonitor downloadMonitor, ApplicationUpdaterCallback callback) { this.config = config; this.vfsPropertiesUrl = vfsPropertiesUrl; this.currentDir = currentDir; this.destDir = destDir; + this.downloadMonitor = downloadMonitor; this.callback = callback; } @@ -228,6 +244,7 @@ * * Si callback existe envoi les messages necessaire */ + @Override public void run() { try { FileSystemOptions vfsConfig = getVFSConfig(config); @@ -282,7 +299,6 @@ log.debug("Can't clean directory", doNothing); } - log.warn(String.format( "Can't update application '%s' with url '%s'", app, info.url)); @@ -311,10 +327,11 @@ * nommera au final "monApp/Readme.txt" * * @param vfsConfig le proxy a utiliser pour la connexion a l'url - * @param info information sur l'application a mettre a jour + * @param info information sur l'application a mettre a jour * @throws Exception */ - protected void doUpdate(FileSystemOptions vfsConfig, ApplicationInfo info) throws Exception { + protected void doUpdate(FileSystemOptions vfsConfig, + ApplicationInfo info) throws Exception { if (info.destDir != null) { File dest = new File(info.destDir, info.name); String url = toVfsURL(info.url); @@ -325,11 +342,22 @@ if (callback != null) { callback.startUpdate(info); } - deepCopy(vfsConfig, url, dest.getAbsolutePath()); + // le type de l'archive contenant la mise à jour + String archiveType = url.substring(0, url.indexOf(':')); + + // recuperation de l'archive en locale (dans /tmp) + File archive = downloadUpdate(vfsConfig, info, url.substring(archiveType.length() + 1)); + + // extraction depuis l'archive téléchargée de l'unique répertoire vers la destination + explodeUpdate(vfsConfig, + info, + archiveType, + archive, + dest); + // ajout du fichier de version - File versionFile = new File(dest, VERSION_FILE); - FileUtils.writeStringToFile(versionFile, info.newVersion); + createVersionFile(dest, info.newVersion); log.info(String.format( "Application '%s' is uptodate with version '%s' in '%s'", info.name, info.newVersion, info.destDir)); @@ -339,6 +367,94 @@ } /** + * Télécharge une archive dans un fichier temporaraire. + * + * Si l'archive a plus d'un repertoire root, une exception est levee + * + * @param info + * @param srcPath source path de la forme vfs2 ex:"zip:http://www.nuiton.org/attachments/download/830/nuiton-utils-2.6.5-deps.…" + * @throws FileSystemException + */ + protected File downloadUpdate(FileSystemOptions vfsConfig, + ApplicationInfo info, + String srcPath) throws IOException { + File result = new File(FileUtils.getTempDirectory(), srcPath); + + FileSystemManager fsManager = VFS.getManager(); + FileObject source = fsManager.resolveFile(srcPath, vfsConfig); + + if (!source.exists()) { + throw new UpdateNotFoundException(info); + } + FileObject target = fsManager.toFileObject(result); + InputStream input = source.getContent().getInputStream(); + try { + OutputStream output = target.getContent().getOutputStream(); + try { + long inputSize = source.getContent().getSize(); + if (downloadMonitor != null) { + downloadMonitor.setSize(inputSize); + } + long count = 0; + int n; + byte[] buffer = new byte[1024]; + while (-1 != (n = input.read(buffer))) { + output.write(buffer, 0, n); + count += n; + if (downloadMonitor != null) { + downloadMonitor.setCurrent(count); + } + } + output.close(); + } finally { + + IOUtils.closeQuietly(output); + } + input.close(); + } finally { + IOUtils.closeQuietly(input); + } + return result; + } + + /** + * Recopie le contenu du répertoire de l'archive dans le + * répertoire {@code target}. + * + * Si le répertoire cible existe déjà, il sera alors vidé. + * + * Si l'archive ne contient pas exactement un répertoire alors une exception est levée + * + * @param archiveType le type de l'archive + * @param source l'archive à décompresser + * @param target le répertoire cible + * @throws FileSystemException + * @throws UpdateInvalidArchiveLayoutException + * si l'archive n'a pas le bon format + */ + protected void explodeUpdate(FileSystemOptions vfsConfig, + ApplicationInfo info, + String archiveType, + File source, + File target) throws FileSystemException, UpdateInvalidArchiveLayoutException { + + FileSystemManager fsManager = VFS.getManager(); + FileObject sourceObject = fsManager.resolveFile(archiveType + ":" + source.getAbsolutePath(), vfsConfig); + + FileObject[] children = sourceObject.getChildren(); + if (children.length != 1) { + throw new UpdateInvalidArchiveLayoutException(info, source); + } + // clean target + FileObject targetObject = fsManager.toFileObject(target); + targetObject.delete(new AllFileSelector()); + + //copy to it the archive only directory + FileObject child = children[0]; + targetObject.copyFrom(child, new AllFileSelector()); + } + + /** * Recupere le contenu du repertoire de l'archive pour le mettre dans targetPath * si targetPath existait deja, il est supprime au prealable. * @@ -347,7 +463,9 @@ * @param srcPath source path de la forme vfs2 ex:"zip:http://www.nuiton.org/attachments/download/830/nuiton-utils-2.6.5-deps.…" * @param targetPath le path destination * @throws FileSystemException + * @deprecated since 2.6.11, no more used */ + @Deprecated protected void deepCopy(FileSystemOptions vfsConfig, String srcPath, String targetPath) throws FileSystemException { Added: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/DownloadMonitor.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/DownloadMonitor.java (rev 0) +++ trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/DownloadMonitor.java 2013-03-12 23:03:34 UTC (rev 2528) @@ -0,0 +1,38 @@ +package org.nuiton.util.updater; + +/* + * #%L + * Nuiton Utils :: Nuiton Updater + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 CodeLutin, Tony Chemit + * %% + * 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% + */ + +/** + * Pour monitorer la progression d'un téléchargement. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.11 + */ +public interface DownloadMonitor { + + void setSize(long size); + + void setCurrent(long current); +} Property changes on: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/DownloadMonitor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateInvalidArchiveLayoutException.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateInvalidArchiveLayoutException.java (rev 0) +++ trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateInvalidArchiveLayoutException.java 2013-03-12 23:03:34 UTC (rev 2528) @@ -0,0 +1,56 @@ +package org.nuiton.util.updater; + +/* + * #%L + * Nuiton Utils :: Nuiton Updater + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 CodeLutin, Tony Chemit + * %% + * 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.io.File; + +/** + * Exception leve lorsque l'archive d'une mise à jour ne respecte pas le bon + * format (à savoir contenir un uniquement répertoire). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.11 + */ +public class UpdateInvalidArchiveLayoutException extends Exception { + + private static final long serialVersionUID = 1L; + + + protected final ApplicationInfo info; + protected final File archiveFile; + + public UpdateInvalidArchiveLayoutException(ApplicationInfo info, File archiveFile) { + this.info= info; + this.archiveFile = archiveFile; + } + + public ApplicationInfo getInfo() { + return info; + } + + public File getArchiveFile() { + return archiveFile; + } +} Property changes on: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateInvalidArchiveLayoutException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateNotFoundException.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateNotFoundException.java (rev 0) +++ trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateNotFoundException.java 2013-03-12 23:03:34 UTC (rev 2528) @@ -0,0 +1,48 @@ +package org.nuiton.util.updater; + +/* + * #%L + * Nuiton Utils :: Nuiton Updater + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 CodeLutin, Tony Chemit + * %% + * 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.io.IOException; + +/** + * When an update is not found. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.11 + */ +public class UpdateNotFoundException extends IOException { + + private static final long serialVersionUID = 1L; + + protected ApplicationInfo info; + + public UpdateNotFoundException(ApplicationInfo info) { + this.info = info; + } + + public ApplicationInfo getInfo() { + return info; + } +} Property changes on: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateNotFoundException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2527 - in trunk/nuiton-utils: . src/main/java/org/nuiton/util/beans src/test/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org March 12, 2013

March 12, 2013

Author: tchemit Date: 2013-03-12 17:07:04 +0100 (Tue, 12 Mar 2013) New Revision: 2527 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2527 Log: fixes #2587: [BeanUtil] Add method to filter descriptors Modified: trunk/nuiton-utils/pom.xml trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2013-03-12 10:28:51 UTC (rev 2526) +++ trunk/nuiton-utils/pom.xml 2013-03-12 16:07:04 UTC (rev 2527) @@ -85,6 +85,11 @@ </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> 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 2013-03-12 10:28:51 UTC (rev 2526) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java 2013-03-12 16:07:04 UTC (rev 2527) @@ -24,6 +24,10 @@ */ package org.nuiton.util.beans; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.beanutils.PropertyUtils; @@ -31,6 +35,7 @@ import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; import java.util.HashSet; +import java.util.Map; import java.util.Set; /** @@ -52,6 +57,40 @@ } /** + * Is a property is readable ? + * + * @since 2.5.11 + */ + public static final Predicate<PropertyDescriptor> IS_READ_DESCRIPTOR = new Predicate<PropertyDescriptor>() { + @Override + public boolean apply(PropertyDescriptor input) { + return input.getReadMethod() != null; + } + }; + + /** + * Is a property is writable ? + * + * @since 2.5.11 + */ + public static final Predicate<PropertyDescriptor> IS_WRITE_DESCRIPTOR = new Predicate<PropertyDescriptor>() { + @Override + public boolean apply(PropertyDescriptor input) { + return input.getReadMethod() != null; + } + }; + + /** + * Is a property is readable and writable ? + * + * @since 2.5.11 + */ + public static final Predicate<PropertyDescriptor> IS_READ_AND_WRITE_DESCRIPTOR = Predicates.and( + IS_READ_DESCRIPTOR, + IS_WRITE_DESCRIPTOR + ); + + /** * Test if the given type is JavaBean compiliant, says that it has two * public methods : * <ul> @@ -189,7 +228,7 @@ result = false; } else { - String rest = propertyName.substring(dotIndex+1); + String rest = propertyName.substring(dotIndex + 1); result = isNestedReadableProperty(nestedType, rest); } @@ -245,6 +284,72 @@ return result; } + /** + * Scan the given type and obtain {@link PropertyDescriptor} + * given the (optional) predicate (except the {@code class} property of + * any java object). + * + * Note: If no predicate is given, then all descriptors + * are returned. + * + * @param beanType the bean type to scan + * @param predicate the optional predicate to keep descriptor + * @return set of all matching descriptors + * @since 2.6.11 + */ + public static Set<PropertyDescriptor> getDescriptors(Class<?> beanType, + Predicate<PropertyDescriptor> predicate) { + + if (predicate == null) { + predicate = Predicates.alwaysTrue(); + } + + Set<Class<?>> exploredTypes = Sets.newHashSet(); + Map<String, PropertyDescriptor> result = Maps.newTreeMap(); + + getDescriptors(beanType, predicate, result, exploredTypes); + + // the special getClass will never be a JavaBean property... + result.remove("class"); + + return Sets.newHashSet(result.values()); + } + + protected static void getDescriptors(Class<?> beanType, + Predicate<PropertyDescriptor> predicate, + Map<String, PropertyDescriptor> result, + Set<Class<?>> exploredTypes) { + + if (exploredTypes.contains(beanType)) { + + // already explored + return; + } + exploredTypes.add(beanType); + + PropertyDescriptor[] descriptors = + PropertyUtils.getPropertyDescriptors(beanType); + + for (PropertyDescriptor descriptor : descriptors) { + String name = descriptor.getName(); + if (!result.containsKey(name) && predicate.apply(descriptor)) { + result.put(name, descriptor); + } + } + + if (beanType.getSuperclass() != null) { + + // get properties fro super-class + getDescriptors(beanType.getSuperclass(), predicate, result, exploredTypes); + } + Class<?>[] interfaces = beanType.getInterfaces(); + for (Class<?> anInterface : interfaces) { + + // get properties fro super-class + getDescriptors(anInterface, predicate, result, exploredTypes); + } + } + protected static void getReadableProperties(Class<?> beanType, Set<String> result, Set<Class<?>> exploredTypes) { 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 2013-03-12 10:28:51 UTC (rev 2526) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java 2013-03-12 16:07:04 UTC (rev 2527) @@ -24,10 +24,15 @@ */ package org.nuiton.util.beans; +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import org.junit.Assert; import org.junit.Test; import java.beans.PropertyChangeListener; +import java.beans.PropertyDescriptor; import java.beans.beancontext.BeanContextSupport; import java.lang.reflect.InvocationTargetException; import java.util.Set; @@ -86,6 +91,66 @@ } @Test + public void getDescriptors() { + + assertFoundDescriptors(BeanA.class, + BeanUtil.IS_READ_DESCRIPTOR, + BeanA.PROPERTY_A, + BeanA.PROPERTY_B, + BeanA.PROPERTY_C, + BeanA.PROPERTY_D, + BeanA.PROPERTY_E, + BeanA.PROPERTY_F); + + assertFoundDescriptors(BeanB.class, + BeanUtil.IS_READ_DESCRIPTOR, + 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 + ); + + assertFoundDescriptors(getClass(), BeanUtil.IS_READ_DESCRIPTOR); + + assertFoundDescriptors(BeanA.class, + BeanUtil.IS_WRITE_DESCRIPTOR, + BeanA.PROPERTY_A, + BeanA.PROPERTY_B, + BeanA.PROPERTY_C, + BeanA.PROPERTY_D, + BeanA.PROPERTY_E, + BeanA.PROPERTY_F); + + assertFoundDescriptors(BeanB.class, + BeanUtil.IS_WRITE_DESCRIPTOR, + 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 + ); + + assertFoundDescriptors(getClass(), BeanUtil.IS_WRITE_DESCRIPTOR); + } + + @Test public void getWriteableProperties() { assertFoundWriteableProperties(BeanA.class, @@ -233,4 +298,22 @@ Assert.assertTrue("Did not found nested property " + expectedproperty, actual); } } + + protected void assertFoundDescriptors(Class<?> type, + Predicate<PropertyDescriptor> predicate, + String... expectedproperties) { + Set<PropertyDescriptor> actual = BeanUtil.getDescriptors(type, predicate); + Assert.assertEquals(expectedproperties.length, actual.size()); + + ImmutableMap<String, PropertyDescriptor> map = Maps.uniqueIndex(actual, new Function<PropertyDescriptor, String>() { + @Override + public String apply(PropertyDescriptor input) { + return input.getName(); + } + }); + for (String expectedproperty : expectedproperties) { + Assert.assertTrue("Did not found property " + expectedproperty, + map.containsKey(expectedproperty)); + } + } }

1 0

r2526 - trunk/nuiton-utils-maven-report-plugin
by echatellier＠users.nuiton.org March 12, 2013

March 12, 2013

Author: echatellier Date: 2013-03-12 11:28:51 +0100 (Tue, 12 Mar 2013) New Revision: 2526 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2526 Log: fix svn:ignore Modified: trunk/nuiton-utils-maven-report-plugin/ Property changes on: trunk/nuiton-utils-maven-report-plugin ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml .idea + target *.ipr *.iws *.iml .idea .classpath .project .settings

1 0

r2525 - trunk
by tchemit＠users.nuiton.org March 11, 2013

March 11, 2013

Author: tchemit Date: 2013-03-11 12:32:41 +0100 (Mon, 11 Mar 2013) New Revision: 2525 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2525 Log: fixes #2582: Updates mavenpom to 3.4.8 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-05 11:02:29 UTC (rev 2524) +++ trunk/pom.xml 2013-03-11 11:32:41 UTC (rev 2525) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.7</version> + <version>3.4.8</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0