- deployment updated for new project page

- create jar file with versioned name

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@237 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c

java/build.xml

@@ -38,7 +38,7 @@
 	<target name="jar" depends="compile" description="--> Create Jar">
 		<mkdir dir="${project.dir.lib}" />
 		<echo>Building Version ${version.major}.${version.minor}.${version.release}</echo>
-		<jar destfile="${project.dir.lib}/${project.jarfile}">
+		<jar destfile="${project.dir.lib}/${project.jarfile}.jar">
 			<fileset dir="${project.dir.bin}">
 				<patternset refid="classfiles" />
 			</fileset>
@@ -55,6 +55,8 @@
 				</section>
 			</manifest>
 		</jar>
+		<!-- copy and rename to versioned jar -->
+		<copy file="${project.dir.lib}/${project.jarfile}.jar" tofile="${project.dir.lib}/${project.jarfile}-${version.major}.${version.minor}.${version.release}.jar"/>
 	</target>
 
 	<target name="javadoc" description="--> Create Javadoc">

java/deployment.properties

@@ -1,7 +1,8 @@
-java2html.dir.lib=D:/Exchange/Download/java2html/java2html.jar
+java2html.dir.lib=D:/MyDocuments/Download/Programming/java2html
 java2html.dir.src=test/ch/ntb/usb/demo/
 
-project.server.dir=W:/inf/infoportalExternalDocs/projects/libusbJava
+project.server.name=shell.sourceforge.net
+project.server.dir=/home/groups/l/li/libusbjava/htdocs/wp/res
 project.server.dir.doc=${project.server.dir}/doc
 project.server.dir.bin=${project.server.dir}/bin
 project.server.dir.demos=${project.server.dir}/demos

java/deployment.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0"?>
 <!-- ====================================================================== 
-     ch.ntb.usb 
+     ch.ntb.usb
      Ant deployment tasks for ch.ntb.usb
 
-	 NOTE: for deployment, \\www-server\web must be mapped to W:
+	 NOTE: for deployment the properties
+	 	project.server.username
+	 	project.server.password
+	 must be set on the command line
+	 (e.g. -Dproject.server.username=X as jvm command line argument).
 
      schlaepfer                                                                
      ====================================================================== -->
@@ -11,20 +15,22 @@
 	<description>
 		Ant deployment tasks for ch.ntb.usb
 	</description>
-	
+
 	<import file="build.xml" />
 
 	<property file="deployment.properties" />
 
-	<taskdef name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" classpath="${java2html.dir.lib}" />
+	<taskdef name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" classpath="${java2html.dir.lib}/java2html.jar" />
+
 	<target name="java2html">
 		<java2html srcdir="${java2html.dir.src}" destdir="${project.dir.demos}" includes="**/*.java" overwrite="true" style="eclipse" showFileName="true" />
 	</target>
 
-	<target name="deploy" depends="jar, javadoc, java2html" description="--> Deploy to server">
+	<!-- 
+	<target name="deploy" depends="jar, javadoc, java2html" description="-> Deploy to server">
 		<echo message="\\www-server\web must be mapped to W:" />
 		<echo message="copy jar file to server" />
-		<copy file="${project.dir.lib}/${project.jarfile}" todir="${project.server.dir.bin}" />
+		<copy file="${project.dir.lib}/${project.jarfile}.jar" todir="${project.server.dir.bin}" />
 		<echo message="copy javadoc to server" />
 		<copy todir="${project.server.dir.doc}">
 			<fileset dir="${project.dir.doc}" />
@@ -35,4 +41,21 @@
 		</copy>
 	</target>
 	
+	-->
+
+	<target name="deploy" depends="javadoc, java2html" description="-> Deploy to server">
+		<!-- 
+		<echo message="copy jar file to server" />
+		<scp trust="true" file="${project.dir.lib}/${project.jarfile}.jar" todir="${project.server.username}:${project.server.password}@${project.server.name}:${project.server.dir.bin}" />
+		-->
+		<echo message="copy javadoc to server" />
+		<scp trust="true" todir="${project.server.username}:${project.server.password}@${project.server.name}:${project.server.dir.doc}">
+			<fileset dir="${project.dir.doc}" />
+		</scp>
+		<echo message="copy html demo files to server" />
+		<scp trust="true" todir="${project.server.username}:${project.server.password}@${project.server.name}:${project.server.dir.demos}">
+			<fileset dir="${project.dir.demos}" />
+		</scp>
+	</target>
+
 </project>

java/project.properties

@@ -6,5 +6,5 @@ project.dir.bin=bin
 project.dir.lib=lib
 project.dir.doc=doc
 project.dir.demos=demos
-project.jarfile=${project.name}.jar
+project.jarfile=${project.name}
 project.manifest.mainclass=ch.ntb.usb.usbView.UsbView