You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/05/31 16:33:43 UTC
svn commit: r179219 - in /incubator/beehive/trunk: README.txt
distribution.xml netui/ant/build-schema.xml
netui/test/webapps/drt/coreWeb/databinding/bundle/basicnojpf/index.jsp
netui/test/webapps/drt/testRecorder/tests/BundleBasicNoJpf.xml
Author: ekoneil
Date: Tue May 31 07:33:42 2005
New Revision: 179219
URL: http://svn.apache.org/viewcvs?rev=179219&view=rev
Log:
Integ of SVN 179133 into trunk/
BB: self
DRT: Beehive pass
Modified:
incubator/beehive/trunk/README.txt
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/netui/ant/build-schema.xml
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basicnojpf/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BundleBasicNoJpf.xml
Modified: incubator/beehive/trunk/README.txt
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/README.txt?rev=179219&r1=179218&r2=179219&view=diff
==============================================================================
--- incubator/beehive/trunk/README.txt (original)
+++ incubator/beehive/trunk/README.txt Tue May 31 07:33:42 2005
@@ -10,7 +10,6 @@
completeness or stability of the code, it does indicate that the
project has yet to be fully endorsed by the ASF.
-
If you've come here to learn more about Beehive, here are a few
starting points:
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=179219&r1=179218&r2=179219&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Tue May 31 07:33:42 2005
@@ -57,12 +57,6 @@
<property name="text.file.includes.unix" value="**/*.beaninfo,**/*.css,**/*.dtd,**/*.html,**/*.inc,**/*.java,**/*.jcs,**/*.jcx,**/*.jj,**/*.jpf,**/*.jpfs,**/*.js,**/*.jsfb,**/*.jsp,**/*.jspf,**/*.jspx,**/*.jws,**/*.log,**/*.properties,**/*.sql,**/*.tag,**/*.tld,**/*.txt,**/*.TXT,**/*.wsdd,**/*.wsdl,**/*.xml,**/*.xsd,**/*.xsdconfig,**/*.xsl,**/*.xslt,**/Global.app"/>
<property name="text.file.includes.dos" value="**/*.bat,**/*.cmd,${text.file.includes.unix}"/>
-
- <!-- identify whether the current OS is win32 -->
- <condition property="isWindows">
- <os family="windows"/>
- </condition>
-
<!-- ============================================= -->
<!-- -->
<!-- Distribution targets -->
@@ -100,21 +94,6 @@
<ant antfile="${samples.verify.dir}/samples/controls-spring/web/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
</target>
- <macrodef name="update-dist-readme">
- <sequential>
- <!-- update the readme to include the revision number -->
- <build-dist-readme readmedir="${dist.dir}" revtrailer="${dist.readme.rev.trailer}"/>
-
- <!-- build a slightly different readme that sits outside the archive -->
- <copy file="${dist.dir}/README.txt" tofile="${dist.base.dir}/README.txt" overwrite="true" verbose="true"/>
- <concat destfile="${dist.base.dir}/README.txt" append="true">
- <fileset file="${dist.readme.toplvl.trailer}"/>
- </concat>
- <!-- make sure we have consistent eol's after the concat, in case we get mixtures from the different files -->
- <fixcrlf eol="crlf" srcdir="${dist.base.dir}" includes="README.txt"/>
- </sequential>
- </macrodef>
-
<!-- target for building libraries -->
<target name="build.lib">
<copy todir="${lib.dir}/common" failOnError="true">
@@ -179,17 +158,14 @@
<!-- build libraries for distribution -->
<antcall target="build.lib">
- <param name="lib.dir" value="${dist.lib.dir}"/>
+ <param name="lib.dir" value="${dist.lib.dir}/lib"/>
</antcall>
- <copy todir="${dist.lib.dir}" failOnError="true">
+ <copy todir="${dist.lib.dir}/" failOnError="true">
<fileset dir="${beehive.home}">
<include name="LICENSE.TXT"/>
<include name="NOTICE.txt"/>
</fileset>
- <fileset dir="${beehive.home}/build">
- <include name="svn.rev"/>
- </fileset>
</copy>
<!-- copy the readme and update it to include the revision number -->
@@ -205,23 +181,22 @@
<mkdir dir="${dist.src.dir}"/>
<copy todir="${dist.src.dir}" failOnError="true">
<fileset dir="${beehive.home}">
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.txt"/>
+ </fileset>
+ </copy>
+ <copy todir="${dist.src.dir}/src" failOnError="true">
+ <fileset dir="${beehive.home}">
<include name="controls/src/**"/>
<include name="netui/src/**"/>
<include name="wsm/src/**"/>
<include name="system-controls/src/*/**"/>
- <include name="LICENSE.TXT"/>
- <include name="NOTICE.txt"/>
-
<exclude name="**/.svn/**"/>
<exclude name="**/build/**"/>
<exclude name="**/*.log"/>
<exclude name="**/build.xml"/>
<exclude name="**/*.jar"/>
</fileset>
-
- <fileset dir="${beehive.home}/build">
- <include name="svn.rev"/>
- </fileset>
</copy>
<!-- copy the readme and update it to include the revision number -->
@@ -250,9 +225,6 @@
<include name="LICENSE.TXT"/>
<include name="NOTICE.txt"/>
</fileset>
- <fileset dir="${beehive.home}/build">
- <include name="svn.rev"/>
- </fileset>
</copy>
<!-- copy this now, at the end of build.dist we will add in the revision # info -->
@@ -463,9 +435,6 @@
<include name="LICENSE.TXT"/>
<include name="NOTICE.txt"/>
</fileset>
- <fileset dir="${beehive.home}/build">
- <include name="svn.rev"/>
- </fileset>
</copy>
<!-- copy the readme and update it to include the revision number -->
@@ -494,51 +463,16 @@
<antcall target="build.dist.docs.tgz"/>
<antcall target="build.dist.src.zip"/>
<antcall target="build.dist.src.tgz"/>
- <!--
- <antcall target="build.dist.docs.jar"/>
- -->
<!-- verify the distribution archives once they've been created -->
<antcall target="verify.dist.archives"/>
</target>
- <macrodef name="build-dist-readme">
- <attribute name="readmedir"/>
- <attribute name="readme" default="README.txt"/>
- <attribute name="revtrailer"/>
- <attribute name="trailerprefix" default=" "/> <!-- characters prefixed to each line read from revtrailer -->
-
- <sequential>
- <echo message="Adding revision to file @{readmedir}/@{readme}"/>
- <check-exists file="@{readmedir}/@{readme}"/>
- <check-exists file="@{revtrailer}"/>
- <check-exists file="build/svn.rev"/>
-
- <!-- load the revision # into a property -->
- <loadfile property="beehive.rev" srcFile="build/svn.rev">
- <filterchain>
- <tokenfilter>
- <!-- strip off everything before the revision flagged by the preceeding # -->
- <containsregex pattern=".*#" replace=""/>
- </tokenfilter>
- </filterchain>
- </loadfile>
-
- <!-- append the beehive revision trailer to the readme, then we can substitute in the rev # -->
- <concat destfile="@{readmedir}/@{readme}" append="true">
- <fileset file="@{revtrailer}"/>
- <filterchain>
- <prefixlines prefix="@{trailerprefix}"/>
- </filterchain>
- </concat>
-
- <!-- substitute the beehive svn revision number into the tag in the readme file -->
- <replace file="@{readmedir}/@{readme}" token="@BEEHIVE_REV@" value="${beehive.rev}"/>
-
- <!-- make sure we have consistent eol's after the concats, in case we get mixtures from the different files -->
- <fixcrlf eol="crlf" srcdir="@{readmedir}" includes="@{readme}"/>
- </sequential>
- </macrodef>
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- Distribution Archives -->
+ <!-- -->
+ <!-- ============================================= -->
<target name="build.dist.zip" description="Builds a Beehive distribution zipfile">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
@@ -547,9 +481,16 @@
<fixcrlf eol="crlf" srcdir="${dist.base.dir}/${dist.name}" includes="${text.file.includes.dos}"/>
<mkdir dir="${dist.archives.dir}"/>
+
<!-- exclude the docs/*txt files to eliminate redundant readmes, notices, licenses, etc. -->
- <zip destfile="${dist.archives.dir}/${dist.name}.zip" includes="${dist.name}/**"
- excludes="${dist.name}/docs/*.txt,${dist.name}/docs/*.TXT" basedir="${dist.base.dir}"/>
+ <zip destfile="${dist.archives.dir}/${dist.name}.zip">
+ <zipfileset dir="${dist.base.dir}/${dist.name}" prefix="${dist.name}">
+ <include name="**"/>
+ <exclude name="svn.rev"/>
+ <exclude name="docs/*.txt"/>
+ <exclude name="docs/*.TXT"/>
+ </zipfileset>
+ </zip>
</target>
<target name="build.dist.tgz" description="Builds a Beehive distribution tarball (.tar.gz)">
@@ -560,19 +501,21 @@
<mkdir dir="${dist.archives.dir}"/>
<!-- exclude the docs/*txt files to eliminate redundant readmes, notices, licenses, etc. -->
- <tar destfile="${dist.archives.dir}/${dist.name}.tar.gz" basedir="${dist.base.dir}" includes="${dist.name}/**"
- excludes="${dist.name}/docs/*.txt,${dist.name}/docs/*.TXT" compression="gzip"/>
+ <tar destfile="${dist.archives.dir}/${dist.name}.tar.gz" compression="gzip">
+ <tarfileset dir="${dist.base.dir}/${dist.name}" prefix="${dist.name}">
+ <include name="**"/>
+ <exclude name="svn.rev"/>
+ <exclude name="docs/*.txt"/>
+ <exclude name="docs/*.TXT"/>
+ </tarfileset>
+ </tar>
</target>
- <target name="build.dist.lib.tgz" description="Builds a Beehive library distribution tarball (.tar.gz)">
- <fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
-
- <!-- Change all text files to LF line endings. -->
- <fixcrlf eol="lf" srcdir="${dist.base.dir}/${dist.lib.name}" includes="${text.file.includes.unix}"/>
-
- <mkdir dir="${dist.archives.dir}"/>
- <tar destfile="${dist.archives.dir}/${dist.lib.name}.tar.gz" basedir="${dist.base.dir}" includes="${dist.lib.name}/**" compression="gzip"/>
- </target>
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- Library Distribution Archives -->
+ <!-- -->
+ <!-- ============================================= -->
<target name="build.dist.lib.zip" description="Builds a Beehive library distribution zipfile">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
@@ -581,51 +524,102 @@
<fixcrlf eol="crlf" srcdir="${dist.base.dir}/${dist.lib.name}" includes="${text.file.includes.dos}"/>
<mkdir dir="${dist.archives.dir}"/>
- <zip destfile="${dist.archives.dir}/${dist.lib.name}.zip" includes="${dist.lib.name}/**" basedir="${dist.base.dir}"/>
+ <zip destfile="${dist.archives.dir}/${dist.lib.name}.zip">
+ <zipfileset dir="${dist.base.dir}/${dist.lib.name}" prefix="${dist.lib.name}">
+ <include name="**"/>
+ <exclude name="svn.rev"/>
+ <exclude name="docs/*.txt"/>
+ <exclude name="docs/*.TXT"/>
+ </zipfileset>
+ </zip>
</target>
- <target name="build.dist.docs.jar" depends="build.dist" description="Builds a Beehive distribution docs JAR">
+ <target name="build.dist.lib.tgz" description="Builds a Beehive library distribution tarball (.tar.gz)">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
+ <!-- Change all text files to LF line endings. -->
+ <fixcrlf eol="lf" srcdir="${dist.base.dir}/${dist.lib.name}" includes="${text.file.includes.unix}"/>
+
<mkdir dir="${dist.archives.dir}"/>
- <jar destfile="${dist.archives.dir}/${dist.docs.name}.jar" basedir="${dist.dir}/docs"/>
+ <tar destfile="${dist.archives.dir}/${dist.lib.name}.tar.gz" compression="gzip">
+ <tarfileset dir="${dist.base.dir}/${dist.lib.name}" prefix="${dist.lib.name}">
+ <include name="**"/>
+ <exclude name="svn.rev"/>
+ <exclude name="docs/*.txt"/>
+ <exclude name="docs/*.TXT"/>
+ </tarfileset>
+ </tar>
</target>
- <target name="build.dist.docs.zip" description="Builds a Beehive distribution docs zipfile">
- <property name="tmpdocsdir" location="${dist.tmp.dir}/${dist.docs.name}" />
- <copy todir="${tmpdocsdir}">
- <fileset dir="${dist.dir}/docs" />
- </copy>
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- Docs Distribution Archives -->
+ <!-- -->
+ <!-- ============================================= -->
+ <target name="build.dist.docs.zip" description="Builds a Beehive distribution docs zipfile">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to CRLF line endings. -->
- <fixcrlf eol="crlf" srcdir="${dist.tmp.dir}/${dist.docs.name}" includes="${text.file.includes.dos}"/>
+ <fixcrlf eol="crlf" srcdir="${dist.dir}/docs" includes="${text.file.includes.dos}"/>
<mkdir dir="${dist.archives.dir}"/>
- <zip destfile="${dist.archives.dir}/${dist.docs.name}.zip" basedir="${dist.tmp.dir}" includes="${dist.docs.name}/**" />
-
- <delete dir="${tmpdocsdir}" />
+ <zip destfile="${dist.archives.dir}/${dist.docs.name}.zip">
+ <zipfileset dir="${dist.dir}" prefix="${dist.docs.name}">
+ <include name="docs/**"/>
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.txt"/>
+ <include name="README.txt"/>
+ <exclude name="svn.rev"/>
+ <exclude name="docs/*.txt"/>
+ <exclude name="docs/*.TXT"/>
+ </zipfileset>
+ </zip>
</target>
<target name="build.dist.docs.tgz" description="Builds a Beehive distribution docs tarball (.tar.gz)">
- <property name="tmpdocsdir" location="${dist.tmp.dir}/${dist.docs.name}" />
- <copy todir="${tmpdocsdir}">
- <fileset dir="${dist.dir}/docs" />
- </copy>
-
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to LF line endings. -->
- <fixcrlf eol="lf" srcdir="${dist.tmp.dir}/${dist.docs.name}" includes="${text.file.includes.unix}"/>
+ <fixcrlf eol="lf" srcdir="${dist.dir}/docs" includes="${text.file.includes.unix}"/>
<mkdir dir="${dist.archives.dir}"/>
- <tar destfile="${dist.archives.dir}/${dist.docs.name}.tar.gz" basedir="${dist.tmp.dir}" includes="${dist.docs.name}/**" compression="gzip"/>
-
- <delete dir="${tmpdocsdir}" />
+ <tar destfile="${dist.archives.dir}/${dist.docs.name}.tar.gz" compression="gzip">
+ <tarfileset dir="${dist.dir}" prefix="${dist.docs.name}">
+ <include name="docs/**"/>
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.txt"/>
+ <include name="README.txt"/>
+ <exclude name="docs/*.txt"/>
+ <exclude name="docs/*.TXT"/>
+ </tarfileset>
+ </tar>
</target>
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- Source Distribution Archives -->
+ <!-- -->
+ <!-- ============================================= -->
+
+ <target name="build.dist.src.zip" description="Builds a Beehive source distribution zipfile">
+ <fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
+
+ <!-- Change all text files to CRLF line endings. -->
+ <fixcrlf eol="crlf" srcdir="${dist.base.dir}/${dist.src.name}" includes="${text.file.includes.dos}"/>
+
+ <mkdir dir="${dist.archives.dir}"/>
+ <zip destfile="${dist.archives.dir}/${dist.src.name}.zip">
+ <zipfileset dir="${dist.base.dir}/${dist.src.name}" prefix="${dist.src.name}/">
+ <include name="src/**"/>
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.txt"/>
+ <include name="README.txt"/>
+ </zipfileset>
+ </zip>
+ </target>
+
<target name="build.dist.src.tgz" description="Builds a Beehive source distribution tarball (.tar.gz)">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
@@ -633,17 +627,21 @@
<fixcrlf eol="lf" srcdir="${dist.base.dir}/${dist.src.name}" includes="${text.file.includes.unix}"/>
<mkdir dir="${dist.archives.dir}"/>
- <tar destfile="${dist.archives.dir}/${dist.src.name}.tar.gz" basedir="${dist.base.dir}" includes="${dist.src.name}/**" compression="gzip"/>
+ <tar destfile="${dist.archives.dir}/${dist.src.name}.tar.gz" compression="gzip">
+ <tarfileset dir="${dist.base.dir}/${dist.src.name}" prefix="${dist.src.name}/">
+ <include name="src/**"/>
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.txt"/>
+ <include name="README.txt"/>
+ </tarfileset>
+ </tar>
</target>
- <target name="build.dist.src.zip" description="Builds a Beehive source distribution zipfile">
+ <target name="build.dist.docs.jar" depends="build.dist" description="Builds a Beehive distribution docs JAR">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
- <!-- Change all text files to CRLF line endings. -->
- <fixcrlf eol="crlf" srcdir="${dist.base.dir}/${dist.src.name}" includes="${text.file.includes.dos}"/>
-
<mkdir dir="${dist.archives.dir}"/>
- <zip destfile="${dist.archives.dir}/${dist.src.name}.zip" includes="${dist.src.name}/**" basedir="${dist.base.dir}"/>
+ <jar destfile="${dist.archives.dir}/${dist.docs.name}.jar" basedir="${dist.dir}/docs"/>
</target>
<!-- prereq: you must have built the archives with build.dist.archives already -->
@@ -654,58 +652,6 @@
<verify-archive filebase="${dist.src.name}"/>
</target>
- <macrodef name="verify-archive">
- <attribute name="filebase"/>
-
- <sequential>
- <!-- check the zip file -->
- <echo message="${line.separator}Verifying archive @{filebase}.zip"/>
- <delete dir="${dist.tmp.dir}/@{filebase}"/>
- <mkdir dir="${dist.tmp.dir}/@{filebase}"/>
-
- <unzip src="${dist.archives.dir}/@{filebase}.zip" dest="${dist.tmp.dir}"/>
- <check-exists file="${dist.tmp.dir}/@{filebase}/LICENSE.TXT"/>
- <check-exists file="${dist.tmp.dir}/@{filebase}/NOTICE.txt"/>
- <check-exists file="${dist.tmp.dir}/@{filebase}/README.txt"/>
- <delete dir="${dist.tmp.dir}/@{filebase}"/>
-
- <!-- check the .tar.gz file -->
- <echo message="${line.separator}Verifying archive @{filebase}.tar.gz"/>
- <mkdir dir="${dist.tmp.dir}/@{filebase}"/>
-
- <antcall target="build.dist.untgz">
- <param name="tgz.file" value="${dist.archives.dir}/@{filebase}.tar.gz"/>
- <param name="tgz.dest.dir" value="${dist.tmp.dir}"/>
- </antcall>
-
- <check-exists file="${dist.tmp.dir}/@{filebase}/LICENSE.TXT"/>
- <check-exists file="${dist.tmp.dir}/@{filebase}/NOTICE.txt"/>
- <check-exists file="${dist.tmp.dir}/@{filebase}/README.txt"/>
- <delete dir="${dist.tmp.dir}/@{filebase}"/>
- </sequential>
- </macrodef>
-
- <!-- Do a chk to see if a file exists, but allow turning this off with the docheck attribute.
- Doing this instead of the simple available/fail pattern to reduce the number of properties being used.
- -->
- <macrodef name="check-exists">
- <attribute name="file"/>
- <attribute name="type" default="file"/>
- <attribute name="docheck" default="true"/>
- <sequential>
- <fail message="Required file @{file} could not be found!">
- <condition>
- <and>
- <istrue value="@{docheck}"/>
- <not>
- <available file="@{file}" type="@{type}"/>
- </not>
- </and>
- </condition>
- </fail>
- </sequential>
- </macrodef>
-
<target name="build.dist.untgz">
<untar src="${tgz.file}" dest="${tgz.dest.dir}" compression="gzip"/>
</target>
@@ -762,4 +708,115 @@
<property name="beehive.dist.name" value="${dist.name}"/>
</ant>
</target>
+
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- Local macrodefs -->
+ <!-- -->
+ <!-- ============================================= -->
+
+ <macrodef name="update-dist-readme">
+ <sequential>
+ <!-- update the readme to include the revision number -->
+ <build-dist-readme readmedir="${dist.dir}" revtrailer="${dist.readme.rev.trailer}"/>
+
+ <!-- build a slightly different readme that sits outside the archive -->
+ <copy file="${dist.dir}/README.txt" tofile="${dist.base.dir}/README.txt" overwrite="true" verbose="true"/>
+ <concat destfile="${dist.base.dir}/README.txt" append="true">
+ <fileset file="${dist.readme.toplvl.trailer}"/>
+ </concat>
+ <!-- make sure we have consistent eol's after the concat, in case we get mixtures from the different files -->
+ <fixcrlf eol="crlf" srcdir="${dist.base.dir}" includes="README.txt"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="build-dist-readme">
+ <attribute name="readmedir"/>
+ <attribute name="readme" default="README.txt"/>
+ <attribute name="revtrailer"/>
+ <attribute name="trailerprefix" default=" "/> <!-- characters prefixed to each line read from revtrailer -->
+
+ <sequential>
+ <echo message="Adding revision to file @{readmedir}/@{readme}"/>
+ <check-exists file="@{readmedir}/@{readme}"/>
+ <check-exists file="@{revtrailer}"/>
+ <check-exists file="build/svn.rev"/>
+
+ <!-- load the revision # into a property -->
+ <loadfile property="beehive.rev" srcFile="build/svn.rev">
+ <filterchain>
+ <tokenfilter>
+ <!-- strip off everything before the revision flagged by the preceeding # -->
+ <containsregex pattern=".*#" replace=""/>
+ </tokenfilter>
+ </filterchain>
+ </loadfile>
+
+ <!-- append the beehive revision trailer to the readme, then we can substitute in the rev # -->
+ <concat destfile="@{readmedir}/@{readme}" append="true">
+ <fileset file="@{revtrailer}"/>
+ <filterchain>
+ <prefixlines prefix="@{trailerprefix}"/>
+ </filterchain>
+ </concat>
+
+ <!-- substitute the beehive svn revision number into the tag in the readme file -->
+ <replace file="@{readmedir}/@{readme}" token="@BEEHIVE_REV@" value="${beehive.rev}"/>
+
+ <!-- make sure we have consistent eol's after the concats, in case we get mixtures from the different files -->
+ <fixcrlf eol="crlf" srcdir="@{readmedir}" includes="@{readme}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="verify-archive">
+ <attribute name="filebase"/>
+ <sequential>
+ <!-- check the zip file -->
+ <echo message="${line.separator}Verifying archive @{filebase}.zip"/>
+ <delete dir="${dist.tmp.dir}/@{filebase}"/>
+ <mkdir dir="${dist.tmp.dir}/@{filebase}"/>
+
+ <unzip src="${dist.archives.dir}/@{filebase}.zip" dest="${dist.tmp.dir}"/>
+ <check-exists file="${dist.tmp.dir}/@{filebase}/LICENSE.TXT"/>
+ <check-exists file="${dist.tmp.dir}/@{filebase}/NOTICE.txt"/>
+ <check-exists file="${dist.tmp.dir}/@{filebase}/README.txt"/>
+ <delete dir="${dist.tmp.dir}/@{filebase}"/>
+
+ <!-- check the .tar.gz file -->
+ <echo message="${line.separator}Verifying archive @{filebase}.tar.gz"/>
+ <mkdir dir="${dist.tmp.dir}/@{filebase}"/>
+
+ <antcall target="build.dist.untgz">
+ <param name="tgz.file" value="${dist.archives.dir}/@{filebase}.tar.gz"/>
+ <param name="tgz.dest.dir" value="${dist.tmp.dir}"/>
+ </antcall>
+
+ <check-exists file="${dist.tmp.dir}/@{filebase}/LICENSE.TXT"/>
+ <check-exists file="${dist.tmp.dir}/@{filebase}/NOTICE.txt"/>
+ <check-exists file="${dist.tmp.dir}/@{filebase}/README.txt"/>
+ <delete dir="${dist.tmp.dir}/@{filebase}"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Do a chk to see if a file exists, but allow turning this off with the docheck attribute.
+ Doing this instead of the simple available/fail pattern to reduce the number of properties being used.
+ -->
+ <macrodef name="check-exists">
+ <attribute name="file"/>
+ <attribute name="type" default="file"/>
+ <attribute name="docheck" default="true"/>
+ <sequential>
+ <fail message="Required file @{file} could not be found!">
+ <condition>
+ <and>
+ <istrue value="@{docheck}"/>
+ <not>
+ <available file="@{file}" type="@{type}"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+ </sequential>
+ </macrodef>
+
</project>
Modified: incubator/beehive/trunk/netui/ant/build-schema.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/build-schema.xml?rev=179219&r1=179218&r2=179219&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/ant/build-schema.xml (original)
+++ incubator/beehive/trunk/netui/ant/build-schema.xml Tue May 31 07:33:42 2005
@@ -14,14 +14,25 @@
<target name="build" depends="build-schemas,make-jar"/>
<target name="build-schemas">
- <!-- the compiler-core module has schemas in two locations -->
+
<antcall target="build-schema">
<param name="module.name" value="compiler-core"/>
<param name="module.schema.dir" value="${netui.src.dir}/compiler-core/schema/struts-config"/>
</antcall>
+
+ <antcall target="build-schema">
+ <param name="module.name" value="processed-annotations"/>
+ <param name="module.schema.dir" value="${netui.src.dir}/compiler-core/schema/processed-annotations"/>
+ </antcall>
+
<antcall target="build-schema">
<param name="module.name" value="compiler-core"/>
<param name="module.schema.dir" value="${netui.src.dir}/compiler-core/schema/struts-validator"/>
+ </antcall>
+
+ <antcall target="build-schema">
+ <param name="module.name" value="pageflow"/>
+ <param name="module.schema.dir" value="${netui.src.dir}/pageflow/schema"/>
</antcall>
<antcall target="build-schema">
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basicnojpf/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basicnojpf/index.jsp?rev=179219&r1=179218&r2=179219&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basicnojpf/index.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basicnojpf/index.jsp Tue May 31 07:33:42 2005
@@ -19,8 +19,6 @@
<li><b>[</b><netui:span value='${bundle["bar"].BundleString}'/><b>]</b>
<li><b>[</b><netui:span value='${bundle["foo"].BundleString2}'/><b>]</b>
<li><b>[</b><netui:span value='${bundle["bar"].BundleString2}'/><b>]</b>
- <li><b>[</b><netui:span value='${bundle["foo"].$$}'/><b>]</b>
- <li><b>[</b><netui:span value='${bundle["bar"].$$}'/><b>]</b>
</ul>
</body>
</html>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BundleBasicNoJpf.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BundleBasicNoJpf.xml?rev=179219&r1=179218&r2=179219&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BundleBasicNoJpf.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BundleBasicNoJpf.xml Tue May 31 07:33:42 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
<ses:sessionName>BundleBasicNoJpf</ses:sessionName>
- <ses:tester>ekoneil</ses:tester>
- <ses:startDate>08 Jul 2004, 07:52:52.046 AM GMT-07:00</ses:startDate>
- <ses:description>Binding to resource bundles with no page flow.</ses:description>
+ <ses:tester>njantz</ses:tester>
+ <ses:startDate>27 May 2005, 12:09:42.863 PM MDT</ses:startDate>
+ <ses:description>Test simple binding to resource bundles</ses:description>
<ses:tests>
<ses:test>
<ses:testNumber>1</ses:testNumber>
@@ -18,11 +18,15 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>CE16F3B73132FBDFB6492A6189725952</ses:value>
+ <ses:value>53FF40824F5D1797D90D871B01C2C25B</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
<ses:header>
+ <ses:name>---------------</ses:name>
+ <ses:value>------------</ses:value>
+ </ses:header>
+ <ses:header>
<ses:name>accept</ses:name>
<ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
</ses:header>
@@ -31,10 +35,6 @@
<ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value>
</ses:header>
<ses:header>
- <ses:name>accept-encoding</ses:name>
- <ses:value>gzip,deflate</ses:value>
- </ses:header>
- <ses:header>
<ses:name>accept-language</ses:name>
<ses:value>en-us,en;q=0.5</ses:value>
</ses:header>
@@ -44,7 +44,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>JSESSIONID=CE16F3B73132FBDFB6492A6189725952</ses:value>
+ <ses:value>JSESSIONID=53FF40824F5D1797D90D871B01C2C25B</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -56,7 +56,7 @@
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
- <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7) Gecko/20040614 Firefox/0.9</ses:value>
+ <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20041107 Firefox/1.0</ses:value>
</ses:header>
</ses:headers>
</ses:request>
@@ -78,14 +78,12 @@
<li><b>[</b><span>Text Bundle String</span><b>]</b>
<li><b>[</b><span>String 2 from Errors.properties</span><b>]</b>
<li><b>[</b><span>Text Bundle String 2</span><b>]</b>
- <li><b>[</b><span>##$String$##</span><b>]</b>
- <li><b>[</b><span>---- String ----</span><b>]</b>
</ul>
</body>
</html>]]></ses:responseBody>
</ses:response>
</ses:test>
</ses:tests>
- <ses:endDate>08 Jul 2004, 07:52:55.687 AM GMT-07:00</ses:endDate>
+ <ses:endDate>27 May 2005, 12:10:25.724 PM MDT</ses:endDate>
<ses:testCount>1</ses:testCount>
-</ses:recorderSession>
+</ses:recorderSession>
\ No newline at end of file