Update of /var/cvs/speeltuin/ernst/vpro-wizards
In directory james.mmbase.org:/tmp/cvs-serv9403/applications/vpro-wizards
Modified Files:
project.xml build.xml
Log Message:
work in progress
See also: http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards
Index: project.xml
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- project.xml 22 Sep 2008 14:37:28 -0000 1.3
+++ project.xml 8 Oct 2008 08:28:57 -0000 1.4
@@ -129,7 +129,7 @@
<!-- Unit test cases -->
<!--
-->
- <unitTestSourceDirectory>test</unitTestSourceDirectory>
+ <unitTestSourceDirectory>tests</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Tests.java</include>
Index: build.xml
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- build.xml 29 Sep 2008 12:52:18 -0000 1.5
+++ build.xml 8 Oct 2008 08:28:57 -0000 1.6
@@ -6,28 +6,31 @@
<property name="project.jars.includes"
value="spring.jar,spring-webmvc.jar,spring-test.jar,collections-generic*.jar,commons-collections*.jar,commons-fileupload*.jar,commons-lang*.jar,oscache*.jar,nekohtml*.jar,xercesImpl.jar"
/>
<property name="project.jars.dir" location="build" />
- <property name="java.source.version" value="1.5"/>
+ <property name="java.source.version" value="1.5" />
<import file="../buildbase-include.xml" />
<property file="build.properties.default" />
<!--** create the jar **-->
- <target name="jar" description="Create the vpro-wizards jar"
- depends="copy.resources,project.manifest,buildbase.jar" />
+ <target name="jar" description="Create the vpro-wizards jar"
depends="copy.resources,project.manifest,buildbase.jar" />
<target name="init" depends="buildbase.init">
- <available property="xerces.available"
- file="${project.build.dir}/${xerces.file.noversion}"/>
+ <available property="xerces.available"
file="${project.build.dir}/${xerces.file.noversion}" />
</target>
- <target name="compile" depends="vpro-wizards.jars,buildbase.compile"/>
+ <target name="compile" depends="vpro-wizards.jars,buildbase.compile" />
+
+ <!-- copy the web.xml fragment too-->
+ <target name="install" depends="buildbase.install" >
+ <copy tofile="${webapp.dir}/WEB-INF/vprowizards.web.xml"
file="web.fragment.xml"/>
+ </target>
<!--copy all the resources to the classes dir, so they become part of the
jar-->
- <target name="copy.resources" >
+ <target name="copy.resources">
<copy todir="${project.build.dir}/classes">
- <fileset dir="resources"/>
+ <fileset dir="resources" />
</copy>
</target>
@@ -36,10 +39,10 @@
<!--spring-->
<echo message="download spring" />
<antcall target="downloadzip">
- <param name="sourcefile" value="${spring.loc}"/>
- <param name="destfile" value="${spring.dest}"/>
- <param name="destdir" value="${expand.dir}"/>
- <param name="expandedfile" value="${spring.jar}"/>
+ <param name="sourcefile" value="${spring.loc}" />
+ <param name="destfile" value="${spring.dest}" />
+ <param name="destdir" value="${expand.dir}" />
+ <param name="expandedfile" value="${spring.jar}" />
</antcall>
<copy file="${spring.jar}" todir="${project.jar.dir}"
preservelastmodified="true" />
@@ -49,17 +52,17 @@
<!--commons collections-->
<echo message="download commons-collections" />
<antcall target="download">
- <param name="sourcefile" value="${comm.collections.loc}"/>
- <param name="destfile"
value="${download.dir}/${comm.collections.file}"/>
+ <param name="sourcefile"
value="${comm.collections.loc}" />
+ <param name="destfile"
value="${download.dir}/${comm.collections.file}" />
</antcall>
<copy file="${download.dir}/${comm.collections.file}"
todir="${project.jar.dir}" preservelastmodified="true" />
<echo message="download commons-collections (with generics support)" />
<antcall target="downloadzip">
- <param name="sourcefile" value="${commons.collections.loc}"/>
- <param name="destfile" value="${commons.collections.dest}"/>
- <param name="destdir" value="${expand.dir}"/>
- <param name="expandedfile" value="${commons.collections.jar}"/>
+ <param name="sourcefile"
value="${commons.collections.loc}" />
+ <param name="destfile"
value="${commons.collections.dest}" />
+ <param name="destdir" value="${expand.dir}" />
+ <param name="expandedfile"
value="${commons.collections.jar}" />
</antcall>
<copy file="${commons.collections.jar}" todir="${project.jar.dir}"
preservelastmodified="true" />
@@ -67,27 +70,26 @@
<!--commons lang-->
<echo message="download commons-lang" />
<antcall target="download">
- <param name="sourcefile" value="${comm.lang.loc}"/>
- <param name="destfile" value="${download.dir}/${comm.lang.file}"/>
+ <param name="sourcefile" value="${comm.lang.loc}" />
+ <param name="destfile"
value="${download.dir}/${comm.lang.file}" />
</antcall>
<copy file="${download.dir}/${comm.lang.file}"
todir="${project.jar.dir}" preservelastmodified="true" />
<!--nekohtml-->
<echo message="download nekohtml" />
<antcall target="download">
- <param name="sourcefile" value="${nekohtml.loc}"/>
- <param name="destfile" value="${download.dir}/${nekohtml.file}"/>
+ <param name="sourcefile" value="${nekohtml.loc}" />
+ <param name="destfile"
value="${download.dir}/${nekohtml.file}" />
</antcall>
<copy file="${download.dir}/${nekohtml.file}"
todir="${project.jar.dir}" preservelastmodified="true" />
- ch
- <antcall target="download.xerces"/>
+ <antcall target="download.xerces" />
<!--oscache-->
<echo message="download oscache" />
<antcall target="download">
- <param name="sourcefile" value="${oscache.loc}"/>
- <param name="destfile" value="${download.dir}/${oscache.file}"/>
+ <param name="sourcefile" value="${oscache.loc}" />
+ <param name="destfile"
value="${download.dir}/${oscache.file}" />
</antcall>
<copy file="${download.dir}/${oscache.file}"
todir="${project.jar.dir}" preservelastmodified="true" />
</target>
@@ -96,27 +98,27 @@
<target name="download.xerces" unless="xerces.available" depends="init">
<echo message="download xerces" />
<antcall target="download">
- <param name="sourcefile" value="${xerces.loc}"/>
- <param name="destfile"
value="${download.dir}/${xerces.file.noversion}"/>
+ <param name="sourcefile" value="${xerces.loc}" />
+ <param name="destfile"
value="${download.dir}/${xerces.file.noversion}" />
</antcall>
<copy file="${download.dir}/${xerces.file.noversion}"
todir="${project.jar.dir}" preservelastmodified="false" />
</target>
<!--** test **-->
<target name="test" depends="init">
- <echo message="build.dir: ${build.dir}"/>
- <echo message="webapp.dir: ${webapp.dir}"/>
- <echo message="download.dir: ${download.dir}"/>
- <echo message="templates.dir: ${templates.dir}"/>
- <echo message="templates.available: ${templates.available}"/>
- <echo message="project.templates.dir: ${project.templates.dir}"/>
- <echo message="examples.dir: ${examples.dir}"/>
- <echo message="project.target.examples.dir:
${project.target.examples.dir}"/>
- <echo message="project.examples.dir: ${project.examples.dir}"/>
- <echo message="project.build.dir: ${project.build.dir}"/>
- <echo message="project.source.dir: ${project.source.dir}"/>
- <echo message="tagfiles.available: ${tagfiles.available}"/>
- <echo message="xerces.available: ${xerces.available}"/>
+ <echo message="build.dir: ${build.dir}" />
+ <echo message="webapp.dir: ${webapp.dir}" />
+ <echo message="download.dir: ${download.dir}" />
+ <echo message="templates.dir: ${templates.dir}" />
+ <echo message="templates.available: ${templates.available}" />
+ <echo message="project.templates.dir: ${project.templates.dir}"
/>
+ <echo message="examples.dir: ${examples.dir}" />
+ <echo message="project.target.examples.dir:
${project.target.examples.dir}" />
+ <echo message="project.examples.dir: ${project.examples.dir}" />
+ <echo message="project.build.dir: ${project.build.dir}" />
+ <echo message="project.source.dir: ${project.source.dir}" />
+ <echo message="tagfiles.available: ${tagfiles.available}" />
+ <echo message="xerces.available: ${xerces.available}" />
</target>
</project>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
