Author: tchemit Date: 2013-07-20 16:25:42 +0200 (Sat, 20 Jul 2013) New Revision: 2588 Url: http://nuiton.org/projects/nuiton-updater/repository/revisions/2588 Log: transform from nuiton-utils project Added: trunk/src/license/ trunk/src/license/THIRD-PARTY.properties trunk/src/main/ trunk/src/main/java/org/nuiton/updater/ trunk/src/test/ trunk/src/test/java/org/nuiton/updater/ Removed: branches/0.29-SNAPSHOT/ branches/codelutin/ branches/lutinutil-sans-vcs/ tags/0.21/ tags/0.22/ tags/0.25/ tags/0.26/ tags/0.27/ tags/0.30/ tags/1.0/ tags/nuiton-utils-1.1.0-rc-1/ tags/nuiton-utils-1.1.0-rc-2/ tags/nuiton-utils-1.1.0-rc-3/ tags/nuiton-utils-1.1.0-rc-4/ tags/nuiton-utils-1.1.0-rc-5/ tags/nuiton-utils-1.1.0-rc-6/ tags/nuiton-utils-1.1.0-rc-7/ tags/nuiton-utils-1.1.0-rc-8/ tags/nuiton-utils-1.2.1/ tags/nuiton-utils-1.2.2/ tags/nuiton-utils-1.4.1/ tags/nuiton-utils-1.4.2/ tags/nuiton-utils-2.4.1/ tags/nuiton-utils-2.4.2/ tags/nuiton-utils-2.4.3/ tags/nuiton-utils-2.4.4/ tags/nuiton-utils-2.4.5/ tags/nuiton-utils-2.4.6/ tags/nuiton-utils-2.4.7/ tags/nuiton-utils-2.4.8/ tags/nuiton-utils-2.6.1/ tags/nuiton-utils-2.6.2/ tags/nuiton-utils-2.6.3/ tags/nuiton-utils-2.6.4/ tags/nuiton-utils-2.6.5/ tags/nuiton-utils-2.6.6/ tags/nuiton-utils-2.6.7/ tags/nuiton-utils-2.6.8/ tags/nuiton-utils-2.6.9/ tags/ver-isis-2-0-11/ trunk/changelog.txt trunk/nuiton-config/ trunk/nuiton-csv/ trunk/nuiton-updater/ trunk/nuiton-utils-maven-report-plugin/ trunk/nuiton-utils/ trunk/nuiton-validator/ trunk/src/main/java/org/nuiton/util/ trunk/src/test/java/org/nuiton/util/ Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/updater/AbstractApplicationUpdaterAction.java trunk/src/main/java/org/nuiton/updater/ApplicationInfo.java trunk/src/main/java/org/nuiton/updater/ApplicationUpdater.java trunk/src/main/java/org/nuiton/updater/ApplicationUpdaterActionGetVersions.java trunk/src/main/java/org/nuiton/updater/ApplicationUpdaterActionUpdate.java trunk/src/main/java/org/nuiton/updater/ApplicationUpdaterCallback.java trunk/src/main/java/org/nuiton/updater/DownloadMonitor.java trunk/src/main/java/org/nuiton/updater/UpdateInvalidArchiveLayoutException.java trunk/src/main/java/org/nuiton/updater/UpdateNotFoundException.java trunk/src/site/apt/index.apt trunk/src/site/site_fr.xml trunk/src/test/java/org/nuiton/updater/ApplicationUpdaterTest.java trunk/src/test/resources/ApplicationUpdaterNetworkAuthTest.properties trunk/src/test/resources/ApplicationUpdaterNetworkTest.properties trunk/src/test/resources/ApplicationUpdaterTest.properties trunk/src/test/resources/log4j.properties Deleted: trunk/changelog.txt =================================================================== Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/pom.xml 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,67 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Nuiton Utils - %% - Copyright (C) 2004 - 2012 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% - --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.11</version> + <version>3.4.13</version> </parent> - <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <artifactId>nuiton-updater</artifactId> + <version>3.0-SNAPSHOT</version> - <modules> - <module>nuiton-utils</module> - <module>nuiton-config</module> - <module>nuiton-updater</module> - <module>nuiton-csv</module> - <module>nuiton-validator</module> - <module>nuiton-utils-maven-report-plugin</module> - </modules> + <name>Nuiton Application Updater</name> + <description>Simple Application updater</description> + <inceptionYear>2013</inceptionYear> + <url>http://maven-site.nuiton.org/nuiton-updater</url> - <name>Nuiton Utils</name> - <description>Parent of nuiton utils projects.</description> - <inceptionYear>2011</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-utils</url> - <developers> <developer> - <name>Brendan Le Ny</name> - <id>bleny</id> - <email>bleny@codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>developer</role> - </roles> - </developer> - - <developer> <name>Benjamin Poussin</name> <id>bpoussin</id> <email>poussin@codelutin.com</email> @@ -70,44 +30,10 @@ <timezone>Europe/Paris</timezone> <roles> <role>developer</role> - <role>Debian packager</role> </roles> </developer> <developer> - <name>Éric Chatellier</name> - <id>echatellier</id> - <email>chatellier@codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>developer</role> - </roles> - </developer> - - <developer> - <name>Florian Desbois</name> - <id>fdesbois</id> - <timezone>Europe/Paris</timezone> - <roles> - <role>developer</role> - </roles> - </developer> - - <developer> - <name>Sylvain Letellier</name> - <id>sletellier</id> - <email>letellier@codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>developer</role> - </roles> - </developer> - - <developer> <name>Tony Chemit</name> <id>tchemit</id> <email>chemit at codelutin dot com</email> @@ -121,224 +47,93 @@ </developers> - <packaging>pom</packaging> - <properties> - <projectId>nuiton-utils</projectId> + <projectId>nuiton-updater</projectId> - <nuitonI18nVersion>2.5</nuitonI18nVersion> - <xworkVersion>2.3.7</xworkVersion> - <doxiaVersion>1.3</doxiaVersion> - - <!-- i18n configuration --> - <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> - <!-- Documentation is in apt format --> <siteSourcesType>apt</siteSourcesType> </properties> - <dependencyManagement> + <dependencies> - <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>2.6.12</version> + </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs2</artifactId> - <version>2.0</version> - <exclusions> - <exclusion> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-provider-svnexe</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>3.0-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs2</artifactId> + <version>2.0</version> + <exclusions> + <exclusion> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-svnexe</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - <version>2.0</version> - </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> - <!-- xworks dependencies --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${xworkVersion}</version> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> - <!-- maven dependencies for report plugin module --> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${mavenVersion}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${mavenVersion}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-settings</artifactId> - <version>${mavenVersion}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - <version>${mavenVersion}</version> - <scope>provided</scope> - </dependency> + </dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>${mavenVersion}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-annotations</artifactId> - <version>${pluginPluginVersion}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - <version>2.2.1</version> - </dependency> - - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - <version>2.2</version> - </dependency> - - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-i18n</artifactId> - <version>1.0-beta-10</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>3.0.10</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- doxia --> - - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <version>${doxiaVersion}</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-site-renderer</artifactId> - <version>${doxiaVersion}</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - <exclusion> - <groupId>velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-decoration-model</artifactId> - <version>${doxiaVersion}</version> - </dependency> - - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-sink-api</artifactId> - <version>${doxiaVersion}</version> - </dependency> - - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.3.04</version> - </dependency> - - </dependencies> - </dependencyManagement> - - <build> - <pluginManagement> - <plugins> - - <!-- plugin i18n --> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - </plugin> - - </plugins> - </pluginManagement> - </build> - <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-updater/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-updater/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-updater/repository/show/trunk</url> </scm> <distributionManagement> @@ -391,6 +186,45 @@ </profile> + <!-- create assemblies at release time --> + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + + <!-- launch in a release the assembly automaticly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> </project> Added: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/src/license/THIRD-PARTY.properties 2013-07-20 14:25:42 UTC (rev 2588) @@ -0,0 +1,20 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - New BSD License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Sat Jul 20 16:20:15 CEST 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Property changes on: trunk/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/main/java/org/nuiton/updater/AbstractApplicationUpdaterAction.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/AbstractApplicationUpdaterAction.java 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/main/java/org/nuiton/updater/AbstractApplicationUpdaterAction.java 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,8 +1,8 @@ -package org.nuiton.util.updater; +package org.nuiton.updater; /* * #%L - * Nuiton Utils :: Nuiton Updater + * Nuiton Application Updater * $Id$ * $HeadURL$ * %% @@ -34,7 +34,7 @@ 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.config.ApplicationConfig; import java.io.BufferedInputStream; import java.io.File; @@ -52,9 +52,7 @@ * * @author tchemit <chemit@codelutin.com> * @since 2.6.12 - * @deprecated since 2.7, use now the http://maven-site.nuiton.org/nuiton-updater project, This module will be remove in version 3.0 */ -@Deprecated public abstract class AbstractApplicationUpdaterAction implements Runnable { /** Logger. */ Modified: trunk/src/main/java/org/nuiton/updater/ApplicationInfo.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationInfo.java 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/main/java/org/nuiton/updater/ApplicationInfo.java 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,8 +1,8 @@ -package org.nuiton.util.updater; +package org.nuiton.updater; /* * #%L - * Nuiton Utils :: Nuiton Updater + * Nuiton Application Updater * $Id$ * $HeadURL$ * %% @@ -33,9 +33,7 @@ * @author bpoussin <poussing@codelutin.com> * @author tchemit <chemit@codelutin.com> * @since 2.7 - * @deprecated since 2.7, use now the http://maven-site.nuiton.org/nuiton-updater project, This module will be remove in version 3.0 */ -@Deprecated public class ApplicationInfo implements Serializable { private static final long serialVersionUID = 1L; Modified: trunk/src/main/java/org/nuiton/updater/ApplicationUpdater.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/main/java/org/nuiton/updater/ApplicationUpdater.java 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,8 +1,8 @@ -package org.nuiton.util.updater; +package org.nuiton.updater; /* * #%L - * Nuiton Utils :: Nuiton Updater + * Nuiton Application Updater * $Id$ * $HeadURL$ * %% @@ -28,8 +28,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.config.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; import java.io.File; import java.io.IOException; @@ -110,9 +110,7 @@ * @author bpoussin <poussing@codelutin.com> * @author tchemit <chemit@codelutin.com> * @since 2.7 - * @deprecated since 2.7, use now the http://maven-site.nuiton.org/nuiton-updater project, This module will be remove in version 3.0 */ -@Deprecated public class ApplicationUpdater { /** Logger. */ Modified: trunk/src/main/java/org/nuiton/updater/ApplicationUpdaterActionGetVersions.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdaterActionGetVersions.java 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/main/java/org/nuiton/updater/ApplicationUpdaterActionGetVersions.java 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,8 +1,8 @@ -package org.nuiton.util.updater; +package org.nuiton.updater; /* * #%L - * Nuiton Utils :: Nuiton Updater + * Nuiton Application Updater * $Id$ * $HeadURL$ * %% @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileSystemOptions; -import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.config.ApplicationConfig; import java.io.File; import java.util.Map; @@ -38,9 +38,7 @@ * * @author tchemit <chemit@codelutin.com> * @since 2.6.12 - * @deprecated since 2.7, use now the http://maven-site.nuiton.org/nuiton-updater project, This module will be remove in version 3.0 */ -@Deprecated public class ApplicationUpdaterActionGetVersions extends AbstractApplicationUpdaterAction { /** Logger. */ Modified: trunk/src/main/java/org/nuiton/updater/ApplicationUpdaterActionUpdate.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdaterActionUpdate.java 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/main/java/org/nuiton/updater/ApplicationUpdaterActionUpdate.java 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,8 +1,8 @@ -package org.nuiton.util.updater; +package org.nuiton.updater; /* * #%L - * Nuiton Utils :: Nuiton Updater + * Nuiton Application Updater * $Id$ * $HeadURL$ * %% @@ -35,7 +35,7 @@ import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileSystemOptions; import org.apache.commons.vfs2.VFS; -import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.config.ApplicationConfig; import java.io.File; import java.io.IOException; @@ -49,9 +49,7 @@ * * @author tchemit <chemit@codelutin.com> * @since 2.6.12 - * @deprecated since 2.7, use now the http://maven-site.nuiton.org/nuiton-updater project, This module will be remove in version 3.0 */ -@Deprecated public class ApplicationUpdaterActionUpdate extends AbstractApplicationUpdaterAction { /** Logger. */ Modified: trunk/src/main/java/org/nuiton/updater/ApplicationUpdaterCallback.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdaterCallback.java 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/main/java/org/nuiton/updater/ApplicationUpdaterCallback.java 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,8 +1,8 @@ -package org.nuiton.util.updater; +package org.nuiton.updater; /* * #%L - * Nuiton Utils :: Nuiton Updater + * Nuiton Application Updater * $Id$ * $HeadURL$ * %% @@ -32,9 +32,7 @@ * @author bpoussin <poussing@codelutin.com> * @author tchemit <chemit@codelutin.com> * @since 2.7 - * @deprecated since 2.7, use now the http://maven-site.nuiton.org/nuiton-updater project, This module will be remove in version 3.0 */ -@Deprecated public interface ApplicationUpdaterCallback { /** * Appeler avant la recuperation des nouvelles versions Modified: trunk/src/main/java/org/nuiton/updater/DownloadMonitor.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/DownloadMonitor.java 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/main/java/org/nuiton/updater/DownloadMonitor.java 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,8 +1,8 @@ -package org.nuiton.util.updater; +package org.nuiton.updater; /* * #%L - * Nuiton Utils :: Nuiton Updater + * Nuiton Application Updater * $Id$ * $HeadURL$ * %% @@ -29,9 +29,7 @@ * * @author tchemit <chemit@codelutin.com> * @since 2.6.11 - * @deprecated since 2.7, use now the http://maven-site.nuiton.org/nuiton-updater project, This module will be remove in version 3.0 */ -@Deprecated public interface DownloadMonitor { void setSize(long size); Modified: trunk/src/main/java/org/nuiton/updater/UpdateInvalidArchiveLayoutException.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateInvalidArchiveLayoutException.java 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/main/java/org/nuiton/updater/UpdateInvalidArchiveLayoutException.java 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,8 +1,8 @@ -package org.nuiton.util.updater; +package org.nuiton.updater; /* * #%L - * Nuiton Utils :: Nuiton Updater + * Nuiton Application Updater * $Id$ * $HeadURL$ * %% @@ -32,9 +32,7 @@ * * @author tchemit <chemit@codelutin.com> * @since 2.6.11 - * @deprecated since 2.7, use now the http://maven-site.nuiton.org/nuiton-updater project, This module will be remove in version 3.0 */ -@Deprecated public class UpdateInvalidArchiveLayoutException extends Exception { private static final long serialVersionUID = 1L; Modified: trunk/src/main/java/org/nuiton/updater/UpdateNotFoundException.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/UpdateNotFoundException.java 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/main/java/org/nuiton/updater/UpdateNotFoundException.java 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,8 +1,8 @@ -package org.nuiton.util.updater; +package org.nuiton.updater; /* * #%L - * Nuiton Utils :: Nuiton Updater + * Nuiton Application Updater * $Id$ * $HeadURL$ * %% @@ -31,9 +31,7 @@ * * @author tchemit <chemit@codelutin.com> * @since 2.6.11 - * @deprecated since 2.7, use now the http://maven-site.nuiton.org/nuiton-updater project, This module will be remove in version 3.0 */ -@Deprecated public class UpdateNotFoundException extends IOException { private static final long serialVersionUID = 1L; Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/site/apt/index.apt 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,15 +1,21 @@ + ---- + Nuiton updater + ---- + ---- + 2013-02-24 + ---- + ~~~ ~~ #%L -~~ Nuiton Utils -~~ +~~ Nuiton Application Updater ~~ $Id$ ~~ $HeadURL$ ~~ %% -~~ Copyright (C) 2004 - 2010 CodeLutin +~~ 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 +~~ 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, @@ -17,76 +23,17 @@ ~~ 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 +~~ 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% ~~~ - ---- - Nuiton utils - ---- - ---- - 2009-08-23 - ---- - Présentation - Ensemble de projets utilitaires. + TODO -Librairie Nuiton-utils - Librairie regroupant les utilitaires classiques sur les fichiers, les tableaux, - les collections, les maps, les chaînes de caractères, ... De plus elle intègre - un parser des arguments et des options pour les lignes de commande (ApplicationConfig). - {{{./nuiton-utils}Plus d'infos}} -Librairie Nuiton-validator - <<Ce module a été déplacé en version 2.7 vers http://maven-site.nuiton.org/nuiton-validator>>. - - <<Le module sera supprimé en version 3.0.>> - - Cette librairie propose une Api de validation plus complète que la JSR-303, - permettant nottament de préciser des scopes (info, erreur, warning, ...) - - {{{./nuiton-validator}Plus d'infos}} - -Librairie Nuiton-csv - - <<Ce module a été déplacé en version 2.7 vers http://maven-site.nuiton.org/nuiton-csv>>. - - <<Le module sera supprimé en version 3.0.>> - - Cette librairie propose une Api simple d'import export au format csv. - - {{{./nuiton-csv}Plus d'infos}} - -Librairie Nuiton-config - - <<Ce module a été déplacé en version 2.7 vers http://maven-site.nuiton.org/nuiton-config>>. - - <<Le module sera supprimé en version 3.0.>> - - Cette librairie propose une Api simple de configuration d'application. - - {{{./nuiton-config}Plus d'infos}} - -Librairie Nuiton-updater - - <<Ce module a été déplacé en version 2.7 vers http://maven-site.nuiton.org/nuiton-updater>>. - - <<Le module sera supprimé en version 3.0.>> - - Cette librairie propose une Api simple de mise à jour d'application. - - {{{./nuiton-updater}Plus d'infos}} - -Rapports Maven - - <<Ajouté en version 2.4.8>>, ce module permet la génération de rapports - Maven liés aux outils offerts par les librairies de ce projet - (ApplicationConfig,...). - - {{{./nuiton-utils-maven-report-plugin}Plus d'infos}} Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/site/site_fr.xml 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Nuiton Utils - + Nuiton Application Updater $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2013 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 @@ -85,8 +84,6 @@ href="${project.url}/index.html"/> </breadcrumbs> - <menu ref="modules"/> - <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> </menu> Modified: trunk/src/test/java/org/nuiton/updater/ApplicationUpdaterTest.java =================================================================== --- trunk/nuiton-updater/src/test/java/org/nuiton/util/updater/ApplicationUpdaterTest.java 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/test/java/org/nuiton/updater/ApplicationUpdaterTest.java 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,8 +1,8 @@ -package org.nuiton.util.updater; +package org.nuiton.updater; /* * #%L - * Nuiton Utils :: Nuiton Updater + * Nuiton Application Updater * $Id$ * $HeadURL$ * %% @@ -36,9 +36,7 @@ * @author bpoussin <poussing@codelutin.com> * @author tchemit <chemit@codelutin.com> * @since 2.7 - * @deprecated since 2.7, use now the http://maven-site.nuiton.org/nuiton-updater project, This module will be remove in version 3.0 */ -@Deprecated public class ApplicationUpdaterTest { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/src/test/resources/ApplicationUpdaterNetworkAuthTest.properties =================================================================== --- trunk/nuiton-updater/src/test/resources/ApplicationUpdaterNetworkAuthTest.properties 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/test/resources/ApplicationUpdaterNetworkAuthTest.properties 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,6 +1,6 @@ ### # #%L -# Nuiton Utils :: Nuiton Updater +# Nuiton Application Updater # $Id$ # $HeadURL$ # %% Modified: trunk/src/test/resources/ApplicationUpdaterNetworkTest.properties =================================================================== --- trunk/nuiton-updater/src/test/resources/ApplicationUpdaterNetworkTest.properties 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/test/resources/ApplicationUpdaterNetworkTest.properties 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,6 +1,6 @@ ### # #%L -# Nuiton Utils :: Nuiton Updater +# Nuiton Application Updater # $Id$ # $HeadURL$ # %% Modified: trunk/src/test/resources/ApplicationUpdaterTest.properties =================================================================== --- trunk/nuiton-updater/src/test/resources/ApplicationUpdaterTest.properties 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/test/resources/ApplicationUpdaterTest.properties 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,6 +1,6 @@ ### # #%L -# Nuiton Utils :: Nuiton Updater +# Nuiton Application Updater # $Id$ # $HeadURL$ # %% Modified: trunk/src/test/resources/log4j.properties =================================================================== --- trunk/nuiton-updater/src/test/resources/log4j.properties 2013-07-20 07:10:55 UTC (rev 2587) +++ trunk/src/test/resources/log4j.properties 2013-07-20 14:25:42 UTC (rev 2588) @@ -1,6 +1,6 @@ ### # #%L -# Nuiton Utils :: Nuiton Updater +# Nuiton Application Updater # $Id$ # $HeadURL$ # %% @@ -30,4 +30,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.nuiton.util.updater=INFO +log4j.logger.org.nuiton.updater=INFO