Author: tchemit Date: 2009-05-15 12:37:28 +0000 (Fri, 15 May 2009) New Revision: 1561 Modified: nuitonutilextra/trunk/pom.xml nuitonutilextra/trunk/src/main/java/org/nuiton/profiling/LutinTrace.java nuitonutilextra/trunk/src/site/site.xml Log: use mavenpom + change artifactId to nuiton-utils-extra, update site links, fix javadoc Modified: nuitonutilextra/trunk/pom.xml =================================================================== --- nuitonutilextra/trunk/pom.xml 2009-05-15 11:40:30 UTC (rev 1560) +++ nuitonutilextra/trunk/pom.xml 2009-05-15 12:37:28 UTC (rev 1561) @@ -7,24 +7,23 @@ <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.5.4</version> - <!--groupId>org.nuiton</groupId> + <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0-SNAPSHOT</version--> + <version>1.0.0-SNAPSHOT</version> </parent> - <!-- assuprimer du de l'utilisation de mavenpom --> - <groupId>org.nuiton</groupId> - - <artifactId>nuitonutilextra</artifactId> - + <artifactId>nuiton-utils-extra</artifactId> <version>1.0.0-SNAPSHOT</version> <dependencies> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>2.4</version> @@ -71,18 +70,11 @@ <properties> - <redmine.project>nuitonutil</redmine.project> - <aspectwerkz.version>2.0</aspectwerkz.version> - <!-- assuprimer du de l'utilisation de mavenpom --> - <labs.id>12</labs.id> - <labs.project>lutinutil</labs.project> - <helper.version>1.0.0-SNAPSHOT</helper.version> - <helper.licenseName>lgpl_v3</helper.licenseName> - <site.home.url>http://lutinutil.labs.libre-entreprise.org</site.home.url> - <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url> - + <!-- a supprimer des qu'on pourra deployer les sites sur nuiton --> + <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/lutinutil/htdocs</site.deploy.url> + </properties> <build> @@ -97,7 +89,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </dependency> </dependencies> </plugin> @@ -121,20 +113,12 @@ <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> - <!--Source control management--> - <!-- a supprimer --> - <scm> - <url>${maven.scm.url}</url> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - </scm> - - <!--Code Lutin Repository--> + <!--Nuiton Repository : pourra etre supprimer lorsqu'on sera sur central --> <repositories> <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <id>nuiton-repository</id> + <name>NuitonRepository</name> + <url>${repository.home.url}</url> <snapshots> <enabled>true</enabled> <checksumPolicy>warn</checksumPolicy> Modified: nuitonutilextra/trunk/src/main/java/org/nuiton/profiling/LutinTrace.java =================================================================== --- nuitonutilextra/trunk/src/main/java/org/nuiton/profiling/LutinTrace.java 2009-05-15 11:40:30 UTC (rev 1560) +++ nuitonutilextra/trunk/src/main/java/org/nuiton/profiling/LutinTrace.java 2009-05-15 12:37:28 UTC (rev 1561) @@ -220,7 +220,7 @@ // le temps reellement passé dans A est representé par les ===== } - /** Affiche les statistiques */ + /** @return les statistiques */ static public String getStatistiqueAndClear() { StringBuffer result = new StringBuffer(); for (LutinTrace trace : instances) { Modified: nuitonutilextra/trunk/src/site/site.xml =================================================================== --- nuitonutilextra/trunk/src/site/site.xml 2009-05-15 11:40:30 UTC (rev 1560) +++ nuitonutilextra/trunk/src/site/site.xml 2009-05-15 12:37:28 UTC (rev 1561) @@ -28,6 +28,7 @@ <links> <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Nuiton" href="http://www.nuiton.org"/> <item name="${project.organization.name}" href="${project.organization.url}"/> </links> @@ -36,15 +37,15 @@ </menu> <menu name="T�l�chargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" name="Bundle sans sources (zip)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" name="Bundle compl�t (zip)"/> </menu>