dion 2004/01/07 21:13:55 Modified: site plugin.jelly project.xml Log: - Remove telnet server dependency for ftp deployment - Thanks to Rajeev Kaul Revision Changes Path 1.23 +1 -18 maven-plugins/site/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/maven-plugins/site/plugin.jelly,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- plugin.jelly 16 Dec 2003 04:17:37 -0000 1.22 +++ plugin.jelly 8 Jan 2004 05:13:55 -0000 1.23 @@ -81,31 +81,14 @@ siteUser = ${maven.username} </echo> - <!-- This needs to taken from the project properties --> - <property name="maven.homepage" value="${pom.siteDirectory}"/> - - <tar tarfile="${maven.build.dir}/${maven.final.name}-site.tar" basedir="${docsDest}"/> - <gzip zipfile="${maven.build.dir}/${maven.final.name}-site.tar.gz" src="${maven.build.dir}/${maven.final.name}-site.tar"/> - <delete file="${maven.build.dir}/${maven.final.name}-site.tar"/> - <!-- FTP to the server --> <ftp server="${pom.siteAddress}" userid="${maven.username}" password="${maven.password}" remotedir="${pom.siteDirectory}"> - <fileset dir="${maven.build.dir}" includes="${maven.final.name}-site.tar.gz" /> + <fileset dir="${docsDest}" includes="**/*.*"/> </ftp> - <!-- FIXME - it would be better to simply ftp each file and not require a telnet session --> - <!-- Expand on the server and chmod --> - <telnet server="${pom.siteAddress}" userid="${maven.username}" password="${maven.password}"> - <read string="%"/> - <write string="cd ${maven.homepage};${maven.site.gunzip.executable} ${maven.final.name}-site.tar.gz;${maven.site.tar.executable} xUvf ${maven.final.name}-site.tar;chmod -R g+u *;rm ${maven.final.name}-site.tar"/> - <read string="%"/> - </telnet> - - <!-- Delete local gzip file --> - <delete file="${maven.build.dir}/${maven.final.name}-site.tar.gz"/> </goal> <!-- ================================================================== --> 1.24 +11 -2 maven-plugins/site/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/maven-plugins/site/project.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- project.xml 5 Jan 2004 06:04:52 -0000 1.23 +++ project.xml 8 Jan 2004 05:13:55 -0000 1.24 @@ -35,10 +35,10 @@ </roles> </developer> <developer> - <name>Stéphane Mor</name> + <name>Stéphane Mor</name> <id>smor</id> <email>[EMAIL PROTECTED]</email> - <organization>Hasgard Systèmes et Réseaux</organization> + <organization>Hasgard Systèmes et Réseaux</organization> <roles> <role>Java Developer</role> </roles> @@ -61,6 +61,15 @@ <version>1.0.1</version> <properties> <classloader>root.maven</classloader> + </properties> + </dependency> + + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>1.1.0</version> + <properties> + <classloader>root</classloader> </properties> </dependency> </dependencies>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]