From 81fc51199e58a165fddc2e12ea9699672aefaee0 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 8 Jan 2004 05:14:38 +0000
Subject: [PATCH] - Remove telnet server dependency for ftp deployment - Thanks
 to Rajeev Kaul

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114572 13f79535-47bb-0310-9956-ffa450edef68
---
 site/plugin.jelly      | 19 +------------------
 site/project.xml       | 13 +++++++++++--
 site/xdocs/changes.xml |  1 +
 3 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/site/plugin.jelly b/site/plugin.jelly
index d1bc6e25..bea8cb28 100644
--- a/site/plugin.jelly
+++ b/site/plugin.jelly
@@ -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>  
 
   <!-- ================================================================== -->
diff --git a/site/project.xml b/site/project.xml
index e4c60c11..f70b33ff 100644
--- a/site/project.xml
+++ b/site/project.xml
@@ -35,10 +35,10 @@
       </roles>
     </developer>
     <developer>
-      <name>Stéphane Mor</name>
+      <name>StÃ©phane Mor</name>
       <id>smor</id>
       <email>stephanemor@yahoo.fr</email>
-      <organization>Hasgard Systèmes et Réseaux</organization>
+      <organization>Hasgard SystÃ¨mes et RÃ©seaux</organization>
       <roles>
         <role>Java Developer</role>
       </roles>
@@ -63,5 +63,14 @@
         <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>
 </project>
diff --git a/site/xdocs/changes.xml b/site/xdocs/changes.xml
index 92b4b8e7..53684781 100644
--- a/site/xdocs/changes.xml
+++ b/site/xdocs/changes.xml
@@ -8,6 +8,7 @@
   <body>
 
     <release version="1.5" date="in CVS">
+      <action dev="dion" type="fix">Remove telnet server for ftp deployment</action>
       <action dev="dion" type="update">Remove unneeded ant dependency</action>
     </release>
 
