Title: [jbehave] [633] trunk: [dn] updating textile-based website
Revision
633
Author
tastapod
Date
2006-12-20 15:07:00 -0600 (Wed, 20 Dec 2006)

Log Message

[dn] updating textile-based website

Modified Paths


Removed Paths

Diff

Modified: trunk/build.xml (632 => 633)

--- trunk/build.xml	2006-12-20 20:50:05 UTC (rev 632)
+++ trunk/build.xml	2006-12-20 21:07:00 UTC (rev 633)
@@ -24,16 +24,16 @@
 
 	<!-- build output structure -->
 	<property name="jdk.version" value="1.4" />
-	<property name="output_dir" location="delete_me" />
-	<property name="classes_dir" location="${output_dir}/classes" />
-	<property name="behaviour_classes_dir" location="${output_dir}/behaviour-classes" />
-	<property name="example_classes_dir" location="${output_dir}/example-classes" />
-	<property name="example_behaviour_classes_dir" location="${output_dir}/example-behaviours" />
-	<property name="jbehave_zip" location="${output_dir}/jbehave.zip" />
-	<property name="dist_dir" location="${output_dir}/${version}" />
-	<property name="binaries_dir" location="${output_dir}/${version}/dist" />
-	<property name="jbehave_jar" location="${binaries_dir}/jbehave.jar" />
-	<property name="jbehave_src_jar" location="${binaries_dir}/jbehave-src.jar" />
+	<property name="working_dir" location="delete_me" />
+	<property name="classes_dir" location="${working_dir}/classes" />
+	<property name="behaviour_classes_dir" location="${working_dir}/behaviour-classes" />
+	<property name="example_classes_dir" location="${working_dir}/example-classes" />
+	<property name="example_behaviour_classes_dir" location="${working_dir}/example-behaviours" />
+	<property name="jbehave_zip" location="${working_dir}/jbehave-${version}.zip" />
+	<property name="dist_dir" location="${working_dir}/${version}" />
+	<property name="binaries_dir" location="${working_dir}/${version}/dist/${version}" />
+	<property name="jbehave_jar" location="${binaries_dir}/jbehave-${version}.jar" />
+	<property name="jbehave_src_zip" location="${binaries_dir}/jbehave-${version}-src.zip" />
 	<property name="website_dist_dir" location="${dist_dir}/website"/>
 	<property name="javadoc_dist_dir" location="${website_dist_dir}/docs/javadoc"/>
 
@@ -44,21 +44,21 @@
 	
 	<!-- general targets -->
 	<target name="clean" description="Clean out output directory">
-		<delete dir="${output_dir}" />
+		<delete dir="${working_dir}" />
 	</target>
 
-	<target name="build" depends="verify-behaviour, build-source-jar" 
-		description="build the jbehave binary and source" />
+	<target name="build" depends="verify-behaviour, build-source-zip" 
+		description="build the jbehave binary and zip up the project" />
 
 	<target name="dist" depends="clean, build, website" description="assemble distribution">
 		<zip taskname="assemble release" destfile="${jbehave_zip}" update="true">
-			<fileset dir="${dist_dir}"/>
+			<zipfileset prefix="jbehave-${version}" dir="${dist_dir}"/>
 		</zip>
 	</target>
 
 	<!-- build and assemble -->
 	<target name="-init">
-		<mkdir dir="${output_dir}" />
+		<mkdir dir="${working_dir}" />
 	</target>
 
 	<target name="build-jar" depends="-init" description="Compile and assemble the jar">
@@ -81,20 +81,15 @@
 		<jar taskname="jbehave jar" basedir="${classes_dir}" jarfile="${jbehave_jar}" />
 	</target>
 
-	<target name="build-source-jar" depends="-init" description="Assemble the source jar">
-		<property name="cotta-src" location="${output_dir}/cotta-src"/>
-		<mkdir dir="${cotta-src}"/>
-		<unzip taskname="importing cotta source" src="" dest="${cotta-src}">
-			<patternset includes="net/**/*.*"/>
-		</unzip>
+	<target name="build-source-zip" depends="-init" description="Assemble the source jar">
 		<mkdir dir="${binaries_dir}" />
-		<jar taskname="jbehave source jar" destfile="${jbehave_src_jar}" update="true">
-			<fileset dir="${core_dir}/src"/>
-			<fileset dir="${extensions_dir}/ant/src"/>
-			<fileset dir="${extensions_dir}/jmock/src"/>
-			<fileset dir="${extensions_dir}/junit/src"/>
-			<fileset dir="${cotta-src}" includes="net/**/*"/>
-		</jar>
+		<zip taskname="jbehave source jar" destfile="${jbehave_src_zip}" update="true">
+			<zipfileset prefix="jbehave-${version}" dir="${basedir}">
+				<exclude name="delete_me/**" />
+				<exclude name="bin/**" />
+				<exclude name="classes/**" />
+			</zipfileset> excludes="delete_me/**, bin/**, classes/**, website/output/**" />
+		</zip>
 	</target>
 
 	<target name="compile-behaviour" depends="build-jar" description="Compile behaviour">
@@ -198,11 +193,9 @@
 	</target>
 
 	<target name="run-example-behaviours" depends="compile-example-behaviours" description="Runs behaviours for examples">
-		<taskdef name="jbehave" classname="${behaviour.runner.task}" classpath="${classes_dir}" />
-
+		<taskdef name="jbehave" classname="${behaviour.runner.task}" classpath="${jbehave_jar}" />
 		<jbehave behavioursClassName="${example.behaviours}">
 			<classpath>
-				<pathelement path="${jbehave_jar}" />
 				<path refid="libs" />
 				<pathelement path="${example_classes_dir}" />
 				<pathelement path="${example_behaviour_classes_dir}" />

Deleted: trunk/website/content/architecture.textile (632 => 633)

--- trunk/website/content/architecture.textile	2006-12-20 20:50:05 UTC (rev 632)
+++ trunk/website/content/architecture.textile	2006-12-20 21:07:00 UTC (rev 633)
@@ -1,3 +0,0 @@
-h1(FirstChild). Architecture
-
-(TODO: Describe JBehave's architecture)

Modified: trunk/website/content/download.textile (632 => 633)

--- trunk/website/content/download.textile	2006-12-20 20:50:05 UTC (rev 632)
+++ trunk/website/content/download.textile	2006-12-20 21:07:00 UTC (rev 633)
@@ -15,8 +15,8 @@
 
 h2. Version 0.8.0
 
-* "jbehave.jar":/dist/0.8.0/jbehave.jar
-* "Everything":/dist/0.8.0/jbehave-src.zip
+* "jbehave-0.8.0.jar":/dist/0.8.0/jbehave-0.8.0.jar
+* "Everything":/dist/0.8.0/jbehave-0.8.0-src.zip
 
 h1(#snapshot). Development Snapshot
 

Modified: trunk/website/content/license.textile (632 => 633)

--- trunk/website/content/license.textile	2006-12-20 20:50:05 UTC (rev 632)
+++ trunk/website/content/license.textile	2006-12-20 21:07:00 UTC (rev 633)
@@ -5,12 +5,11 @@
 
 <div class="Shaded"><pre>
 
-Copyright (c) 2003-2007 Dan North
+Copyright (c) 2003-2007 jbehave.org
 
 All rights reserved.
 
 
-
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 

Modified: trunk/website/content/plugins.textile (632 => 633)

--- trunk/website/content/plugins.textile	2006-12-20 20:50:05 UTC (rev 632)
+++ trunk/website/content/plugins.textile	2006-12-20 21:07:00 UTC (rev 633)
@@ -4,45 +4,52 @@
 
 The following are the plugins under development:
 
+* "Apache Ant":#ant
 * "IntelliJ IDEA":#idea
 * "Eclipse":#eclipse
-* "Apache Ant":#ant
 
-<a name="idea"> </a>
-h2. IntelliJ IDEA
+h2(#ant). Apache ANT
 
-JBehave has an "IDEA":idea_url plug-in that allows developers to launch behaviour verifications.
+First up, you need to define the jbehave task:
 
+<div class="shaded"><pre><taskdef name="jbehave" classname="org.jbehave.ant.JBehaveTask" classpath="jbehave-VERSION.jar" /></pre></div>
+
+Then you simply use it like you would any other task:
+<div class="shaded"><pre>
+	<target name="run-behaviours" depends="compile" description="Run behaviours">
+		<jbehave behavioursClassName="com.example.AllBehaviours">
+			<classpath ... />
+		</jbehave>
+	</target>
+</pre></div>
+
+The @<jbehave>@ task also supports a classpath attribute.
+
+h2(#idea). IntelliJ IDEA
+
+JBehave has an "IDEA":http://www.jetbrains.com/idea plug-in that allows
+developers to run behaviour classes.
+
 !idea.png!
 
-It can be downloaded through "IDEA's plugin download site":idea_plugins_url.
+It can be downloaded through "IDEA's plugin download
+site":http://www.jetbrains.com/idea/plugins/plugins.html.
 
 !idea_plugins.png!
 
-<a name="eclipse"> </a>
-h2. Eclipse
+h2(#eclipse). Eclipse
 
-JBehave plugin for "Eclipse":eclipse_url allows you to launch the behaviour verification 
-process through a short-cut a predefined run configuration.
+JBehave plugin for "Eclipse":http://eclipse.org allows you to run behaviours
+through a short-cut or a predefined run configuration.
 
 !eclipse.png!
 
-You can use Eclipse's update mechanism by adding a "Remote Site" in your Eclipse Software 
-Update configuration which links to "http://www.org.jbehave.org/eclipse":jbehave_eclipse_url.
+You will soon be able to use Eclipse's update mechanism by adding a "Remote Site"
+in your Eclipse Software Update configuration which links to http://jbehave.org/eclipse.
 
 !eclipse_install.png!
 
-After a successful installation, you should be able to see the JBehave feature in your Eclipse about
-dialog:
+After a successful installation, you should be able to see the JBehave feature
+in your Eclipse "About..." dialog:
 
 !eclipse_feature.png!
-
-<a name="ant"> </a>
-h2. Apache ANT
-
-Coming soon!
-
-[idea_url]http://www.jetbrains.com/idea/
-[idea_plugins_url]http://www.jetbrains.com/idea/plugins/plugins.html
-[eclipse_url]http://eclipse.org
-[jbehave_eclipse_url]http://www.org.jbehave.org/eclipse


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to