You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2004/03/10 20:24:38 UTC
cvs commit: jakarta-tapestry/contrib build.xml
hlship 2004/03/10 11:24:38
Modified: examples/VlibBeans build.xml
. status.xml Readme.html build.xml
config common.properties
examples/wap build.xml
framework build.xml
examples/Workbench build.xml
examples/Vlib build.xml
junit build.xml
contrib build.xml
Log:
Remove non-ASL libraries from lib/ext.
Revision Changes Path
1.17 +3 -2 jakarta-tapestry/examples/VlibBeans/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/VlibBeans/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 11 Jul 2003 22:31:34 -0000 1.16
+++ build.xml 10 Mar 2004 19:24:38 -0000 1.17
@@ -13,9 +13,9 @@
<path id="compile.classpath">
<fileset dir="${root.lib.dir}">
<include name="${ext.dir}/*.jar"/>
+ <include name="${j2ee.dir}/*.jar"/>
<include name="*.jar"/>
</fileset>
- <pathelement location="${j2ee.jar.path}"/>
</path>
<target name="init">
<mkdir dir="${classes.dir}"/>
@@ -36,6 +36,7 @@
<target name="install" depends="compile"
description="Compile all classes and build the installed JAR including all package resources."
>
+ <mkdir dir="${examples.dir}"/>
<jar jarfile="${examples.dir}/${vlibbeans.jar}">
<fileset dir="${classes.dir}"/>
<metainf dir=".">
1.27 +7 -1 jakarta-tapestry/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/status.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- status.xml 10 Mar 2004 18:06:07 -0000 1.26
+++ status.xml 10 Mar 2004 19:24:38 -0000 1.27
@@ -198,7 +198,7 @@
<!-- Use due-to to give acknowledgement for patches. -->
<release version="3.0-rc-1" date="unreleased">
-
+
<action type="fix" dev="DS" fixes-bug="27567">
Incorrect example code.
</action>
@@ -254,6 +254,12 @@
<action type="fix" dev="HLS" fixed-bug="27082">
Fix some number conversion problems inside NumberValidator.
+</action>
+
+<action type="update" dev="HLS">
+Dynamically download OGNL and Javassist libraries (in accordance with ASF directives
+about non-ASL code). <b>Unfortunately, this means that we no longer can distribute precompiled
+examples that include those libraries.</b>
</action>
</release>
1.92 +14 -17 jakarta-tapestry/Readme.html
Index: Readme.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/Readme.html,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- Readme.html 4 Feb 2004 22:33:12 -0000 1.91
+++ Readme.html 10 Mar 2004 19:24:38 -0000 1.92
@@ -44,12 +44,17 @@
<br><br>.....................................................<br><br>
<h2>Configuration</h2>
-<p>Tapestry ships with the the Tapestry Workbench and the Virtual Library example applications, which are
-easy to configure and run. To run these Tapestry applications please ensure:
+<p>
+In order to run the Tapestry demos, you need both the <b>binary</b> and <b>source</b> distributions, installed
+into the same directory. Tapestry will compile and build the Workbench and the Virtual Library example
+applications on your workstation, then deploy them into Jetty, Tomcat or JBoss.
+
+<pTo run these Tapestry applications please ensure:
<ul>
<li>JDK 1.3 or newer JVM is installed, and the <tt>JAVA_HOME</tt> environment variable is set.</B>
<li><b><a href="http://jakarta.apache.org/ant">Ant</a></b> 1.5 or newer is installed, and is added
to the system <tt>PATH</tt>.</li>
+<li>You have both the <b>binary</b> and the <b>source</b> Tapestry distributions installed
</ul>
<p>
@@ -75,8 +80,8 @@
<p>
The build process downloads a number of extra files into the
-<code>ext-dist</code>
-directory. See the <A href="ext-dist/README.html">README.html</a> in that directory
+<code>ext-dist</code> and <code>lib/ext</code>
+directories. See the <A href="ext-dist/README.html">README.html</a> in that directory
for more details.
<h3>Configuring JBoss</h3>
@@ -100,7 +105,7 @@
<br>
<b><code>ant -emacs configure run-jboss</code></b>
- <br>This will copy and configure the necessary files in the JBoss installation directory, then
+ <br>This will build, copy and configure the necessary files in the JBoss installation directory, then
run the JBoss server, automatically deploying the example applications.
(The
<code>-emacs</code> option
@@ -170,14 +175,6 @@
<h2>Building from Source</h2>
-<p>To build from source, you must set additional properties inside
-<code>config/build.properties</code>:
-<ul>
-<li><code>j2ee.jar.path</code> - the path to the J2EE libraries (notably, javax.ejb).</li>
-<li><code>servlet.jar.path</code> - the path to the Servlet API libraries.</li>
-</ul>
-</p>
-
<p>
You may then execute <b><code>ant install</code></b> to compile all the frameworks and examples.
Building documentation and running the unit tests requires some additional
@@ -197,12 +194,12 @@
<p>Tapestry is an open source project, hosted by
<a href="http://jakarta.apache.org">The Jakarta Project</a>
and distributed under the terms
-of the <A href="License.txt">Apache Software License 1.1</A>.</p></td></tr></table>
+of the <A href="LICENSE-2.0.txt">Apache Software License 2.0</A>.</p></td></tr></table>
<p>
-<a href="http://jakarta.apache.org"><IMG alt="Jakarta Banner" src="web/images/jakarta-banner.png" border=0 ></a>
+<a href="http://jakarta.apache.org"><IMG alt="Jakarta Banner" src="web/images/jakarta.png" border=0 ></a>
<br>�
-2003 Apache Software Foundation.</p>
+2003-2004 Apache Software Foundation.</p>
</body>
1.93 +74 -22 jakarta-tapestry/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/build.xml,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- build.xml 19 Feb 2004 17:38:00 -0000 1.92
+++ build.xml 10 Mar 2004 19:24:38 -0000 1.93
@@ -83,6 +83,18 @@
<ant dir="examples" target="install" inheritAll="false"/>
</target>
+ <target name="build-workbench" description="Builds and installs the Workbench demo."
+ depends="download-ext-framework">
+ <ant dir="examples/Workbench" target="install" inheritAll="false"/>
+ </target>
+
+ <target name="build-vlib" description="Builds and installs the Virtual Library demo."
+ depends="download-ext-framework,check-for-jboss-dir">
+ <ant dir="examples/VlibBeans" target="install" inheritAll="false"/>
+ <ant dir="examples/Vlib" target="install" inheritAll="false"/>
+ <ant dir="examples/VlibEAR" target="install" inheritAll="false"/>
+ </target>
+
<target name="documentation" depends="download-ext-doc"
description="Builds the Tapestry documentation.">
<ant dir="doc/src" target="install" inheritAll="false"/>
@@ -124,7 +136,9 @@
</target>
<target name="build-dist-copy">
+ <echo>Copying to ${dist.dir} ...</echo>
<!-- Copy all the relevant files to the base directory. -->
+ <echo> Copying documentation ...</echo>
<copy todir="${dist.dir}" includeEmptyDirs="false">
<fileset dir=".">
<include name="build.xml"/>
@@ -159,6 +173,7 @@
</copy>
<!-- The Readme.html file and several of the web pages
include a version number; copy w/ filtering. -->
+ <echo> Copying (and filtering) Readme.html ...</echo>
<copy todir="${dist.dir}" includeEmptyDirs="false">
<fileset dir=".">
<include name="Readme.html"/>
@@ -175,23 +190,25 @@
value="http://jakarta.apache.org/tapestry"/>
</filterset>
</copy>
+
+ <echo> Copying compiled and redistributable libraries ...</echo>
<copy todir="${dist.dir}/lib">
<fileset dir="${root.lib.dir}">
- <include name="**/*.war"/>
- <include name="**/*.ear"/>
<include name="**/*.jar"/>
+ <exclude name="examples/*"/>
+ <exclude name="${ext.dir}/ognl-*.jar"/>
+ <exclude name="${ext.dir}/javassist-*.jar"/>
<include name="**/LICENSE*"/>
- <exclude name="${vlibbeans.jar}"/>
</fileset>
</copy>
- <copy todir="${dist.dir}/lib" flatten="true">
- <fileset dir="examples">
- <include name="**/*.tld"/>
- </fileset>
- </copy>
+ <echo> Copying Tapestry Tag Library Descriptor ...</echo>
+ <copy
+ file="framework/META-INF/taglib.tld"
+ tofile="${dist.dir}/lib/tapestry-${framework.version}.tld"/>
- <copy todir="${dist.dir}">
+ <echo> Copying framework and examples source code ...</echo>
+ <copy todir="${dist.dir}" includeEmptyDirs="false">
<fileset dir=".">
<include name="framework/**"/>
<include name="contrib/**"/>
@@ -205,6 +222,7 @@
<property name="web.dir" value="${dist.dir}/web"/>
<property name="dtd.dir" value="${web.dir}/dtd"/>
+ <echo> Copying Tapestry DTDs ...</echo>
<copy todir="${dtd.dir}" flatten="true">
<fileset dir="framework/src">
<include name="**/*.dtd"/>
@@ -216,16 +234,14 @@
TapestryUsersGuide could generate the HTML files directly into the dist), but
it's still fast *enough* so not to fiddle. -->
- <copy todir="${web.dir}">
+ <echo> Copying documentation, JavaDoc, Clover report ...</echo>
+ <copy todir="${web.dir}" includeEmptyDirs="false">
<fileset dir="web">
<!-- Exclude the top level stuff (any remnants of the old, static web site).
Include all the docs and reports generated below. -->
<exclude name="*.html"/>
<include name="**/*"/>
</fileset>
-
- <!-- And the stuff generated by Forrest. -->
-
<fileset dir="${build.dir}/site"/>
</copy>
</target>
@@ -324,13 +340,13 @@
<path refid="vlib.classpath"/>
<path refid="ext.dist.classpath"/>
<fileset dir="${root.lib.dir}">
- <include name="${servlet.dir}/*.jar"/>
+ <include name="${j2ee.dir}/*.jar"/>
</fileset>
</classpath>
</javadoc>
</target>
- <target name="run-workbench" depends="check-for-jetty-dir"
+ <target name="run-workbench" depends="check-for-jetty-dir,build-workbench"
description="Runs the Tapestry Workbench using Jetty.">
<delete dir="${private.dir}" quiet="true"/>
<mkdir dir="${private.dir}"/>
@@ -375,7 +391,7 @@
value="${tapestry.dir}/tmp/${private.dir}"/>
<property name="jboss.server.default.dir"
value="${jboss.dir}/server/default"/>
- <target name="configure" depends="check-for-jboss-dir"
+ <target name="configure" depends="check-for-jboss-dir,download-ext-examples"
description="Configure the JBoss 3.0.6 server and setup the Tapestry database."
>
<delete dir="${tapestry.lib.dir}" quiet="true"/>
@@ -435,7 +451,7 @@
<unzip src="config/jboss/tapestry-db.zip" dest="${tapestry.db.dir}"/>
</target>
- <target name="deploy-jboss-demos" depends="check-for-jboss-dir"
+ <target name="deploy-jboss-demos" depends="check-for-jboss-dir,build-workbench,build-vlib"
description="Deploys the demos and Tapestry frameworks into JBoss.">
<copy todir="${tapestry.deploy.dir}">
<fileset dir="${examples.dir}">
@@ -479,7 +495,7 @@
all the necessary JARs into the WEB-INF/libs folder. -->
<target name="deploy-tomcat"
- depends="check-for-tomcat-dir"
+ depends="check-for-tomcat-dir,build-workbench"
description="Deploys the Workbench application into Tomcat.">
<copy file="${examples.dir}/${workbench.war}" todir="${tomcat.dir}/webapps"/>
@@ -581,6 +597,19 @@
<param name="destfile" value="${jdom.ext.jar}"/>
<param name="destdir" value="${base.path}"/>
</antcall>
+
+ <antcall target="installzip">
+ <param name="sourcefile" value="${javassist.loc}"/>
+ <param name="dlfile" value="${javassist.jar}"/>
+ <param name="destfile" value="${javassist.ext.jar}"/>
+ <param name="destdir" value="${javassist.dest}"/>
+ </antcall>
+
+ <antcall target="installjar">
+ <param name="sourcefile" value="${ognl.loc}"/>
+ <param name="destfile" value="${ognl.dest}"/>
+ </antcall>
+
</target>
<target name="download-ext-examples" depends="proxyflags"
@@ -629,12 +658,35 @@
</antcall>
</target>
+ <target name="download-alert" unless="download-alert-shown">
+ <echo>
+*********************************************************************************
+* Due to the restrictions of the Apache Software License 2.0, it is necessary *
+* to download some additional libraries that use non-ASL licenses. You should *
+* be aware that redistribution of these files are regulated by their individual *
+* licenses. If you experience problems with the download, consult the file *
+* ext-dist/README.html for details on how to configure the build to work *
+* around a firewall. *
+*********************************************************************************
+ </echo>
+
+ <!-- This doesn't work so well ... the property must be getting lost after
+ each antcall completes. -->
+
+ <property name="download-alert-shown" value="you-betcha"/>
+
+ </target>
+
+ <target name="installjar" unless="exist" depends="setproxy,testexistdest,download-alert">
+ <get src="${sourcefile}" dest="${destfile}"/>
+ </target>
+
<target name="installgz" unless="exist" depends="setproxy,testexistdest">
<antcall target="downloadgz"/>
<copy file="${dlfile}" tofile="${destfile}"/>
</target>
- <target name="downloadgz" unless="exist" depends="setproxy,testexist">
+ <target name="downloadgz" unless="exist" depends="setproxy,testexist,download-alert">
<mkdir dir="${base.path}"/>
<!-- Download and extract the package -->
<get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
@@ -649,7 +701,7 @@
<copy file="${dlfile}" tofile="${destfile}"/>
</target>
- <target name="downloadzip" unless="exist" depends="setproxy,testexist">
+ <target name="downloadzip" unless="exist" depends="setproxy,testexist,download-alert">
<!-- Download and extract the package -->
<mkdir dir="${base.path}"/>
<get src="${sourcefile}" dest="${base.path}/file.zip" />
@@ -679,7 +731,7 @@
</target>
<target name="testexistdest">
- <echo message="Testing for ${destfile}"/>
+ <echo message="Testing for ${destfile}"/>
<available file="${destfile}" property="exist"/>
</target>
1.29 +14 -2 jakarta-tapestry/config/common.properties
Index: common.properties
===================================================================
RCS file: /home/cvs/jakarta-tapestry/config/common.properties,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- common.properties 4 Feb 2004 12:59:49 -0000 1.28
+++ common.properties 10 Mar 2004 19:24:38 -0000 1.29
@@ -25,7 +25,7 @@
# Names of directories under lib
ext.dir=ext
-servlet.dir=j2ee
+j2ee.dir=j2ee
runtime.dir=runtime
jboss.lib.dir=${jboss.dir}/lib
@@ -79,4 +79,16 @@
forrestdl.home=${base.path}/apache-forrest-0.5.1-bin
forrestdl.ant.xml=${forrestdl.home}/forrest.antproxy.xml
forrestdl.loc=http://www.apache.org/dist/xml/forrest/binaries/apache-forrest-0.5.1-bin.zip
+
+# ---- OGNL 2.6.3 ----
+ognl.loc=http://ognl.org/2.6.3/ognl-2.6.3.jar
+ognl.dest=${root.lib.dir}/${ext.dir}/ognl-2.6.3.jar
+
+# ---- Javassist 2.5.1 ----
+
+javassist.loc=http://telia.dl.sourceforge.net/sourceforge/jboss/javassist-2.5.1.zip
+javassist.dest=${base.path}/javassist-2.5.1
+javassist.ext.jar=${root.lib.dir}/${ext.dir}/javassist-2.5.1.jar
+javassist.jar=${javassist.dest}/javassist.jar
+
1.27 +3 -4 jakarta-tapestry/examples/wap/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/wap/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 4 Feb 2004 13:04:22 -0000 1.26
+++ build.xml 10 Mar 2004 19:24:38 -0000 1.27
@@ -14,9 +14,7 @@
<fileset dir="${root.lib.dir}">
<include name="*.jar"/>
<include name="${ext.dir}/*.jar"/>
- </fileset>
- <fileset dir="${root.lib.dir}">
- <include name="${servlet.dir}/*.jar"/>
+ <include name="${j2ee.dir}/*.jar"/>
</fileset>
</path>
<target name="init">
@@ -34,6 +32,7 @@
</target>
<target name="install" depends="compile"
description="Compile all classes and build the installed WAR.">
+ <mkdir dir="${examples.dir}"/>
<war warfile="${examples.dir}/${wap.war}"
webxml="context/WEB-INF/web.xml">
<fileset dir="context">
1.28 +2 -2 jakarta-tapestry/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 4 Feb 2004 12:59:50 -0000 1.27
+++ build.xml 10 Mar 2004 19:24:38 -0000 1.28
@@ -11,7 +11,7 @@
<include name="${ext.dir}/*.jar"/>
</fileset>
<fileset dir="${root.lib.dir}">
- <include name="${servlet.dir}/*.jar"/>
+ <include name="${j2ee.dir}/*.jar"/>
</fileset>
</path>
<target name="init">
1.10 +3 -4 jakarta-tapestry/examples/Workbench/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 4 Feb 2004 13:04:22 -0000 1.9
+++ build.xml 10 Mar 2004 19:24:38 -0000 1.10
@@ -13,13 +13,11 @@
<fileset dir="${root.lib.dir}">
<include name="*.jar"/>
<include name="${ext.dir}/*.jar"/>
+ <include name="${j2ee.dir}/*.jar"/>
</fileset>
<fileset dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
- <fileset dir="${root.lib.dir}">
- <include name="${servlet.dir}/*.jar"/>
- </fileset>
</path>
<target name="init">
<mkdir dir="${classes.dir}"/>
@@ -39,6 +37,7 @@
description="Compile all classes and build the installed WAR.">
<mkdir dir="${build.dir}"/>
+ <mkdir dir="${examples.dir}"/>
<copy file="${config.dir}/web.xml" todir="${build.dir}">
<filterset>
1.32 +10 -11 jakarta-tapestry/examples/Vlib/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Vlib/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 4 Feb 2004 13:04:22 -0000 1.31
+++ build.xml 10 Mar 2004 19:24:38 -0000 1.32
@@ -15,9 +15,7 @@
<include name="*.jar"/>
<include name="examples/${vlibbeans.jar}"/>
<include name="${ext.dir}/*.jar"/>
- </fileset>
- <fileset dir="${root.lib.dir}">
- <include name="${servlet.dir}/*.jar"/>
+ <include name="${j2ee.dir}/*.jar"/>
</fileset>
</path>
<property name="private.dir" value="private"/>
@@ -77,22 +75,23 @@
<pathelement location="${root.dir}/config"/>
</classpath>
<arg value="jetty.xml"/>
- <sysproperty key="net.sf.tapestry.enable-reset-service" value="true"
- />
- <sysproperty key="net.sf.tapestry.vlib.debug-enabled" value="true"/>
+
+ <sysproperty key="org.apache.tapestry.vlib.debug-enabled" value="true"/>
<!-- Enable debugging on port 20150 -->
<jvmarg line="-showversion -Xdebug -Xnoagent"/>
<jvmarg
line="-Xrunjdwp:transport=dt_socket,suspend=n,server=y,address=20150"
/>
<sysproperty key="java.compiler" value="NONE"/>
- <sysproperty key="net.sf.tapestry.disable-caching" value="true"/>
- <sysproperty key="net.sf.tapestry.enable-reset-service" value="true"
+
+ <sysproperty key="org.apache.tapestry.disable-caching" value="true"/>
+ <sysproperty key="org.apache.tapestry.enable-reset-service" value="true"
/>
- <sysproperty key="net.sf.tapestry.asset.dir" value="${private.dir}"
+ <sysproperty key="org.apache.tapestry.asset.dir" value="${private.dir}"
/>
- <sysproperty key="net.sf.tapestry.asset.URL" value="/${private.dir}"
+ <sysproperty key="org.apache.tapestry.asset.URL" value="/${private.dir}"
/>
+
<!-- JNDI Configuration for JBoss -->
<sysproperty key="java.naming.factory.initial"
value="org.jnp.interfaces.NamingContextFactory"/>
1.36 +3 -3 jakarta-tapestry/junit/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/junit/build.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- build.xml 4 Feb 2004 12:59:50 -0000 1.35
+++ build.xml 10 Mar 2004 19:24:38 -0000 1.36
@@ -34,9 +34,9 @@
</fileset>
<pathelement location="${jython.dir}/jython.jar"/>
<fileset dir="${root.lib.dir}">
- <include name="${servlet.dir}/*.jar"/>
+ <include name="${j2ee.dir}/*.jar"/>
</fileset>
- </path>
+ </path>
<target name="init">
<mkdir dir="${classes.dir}"/>
1.21 +3 -13 jakarta-tapestry/contrib/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 11 Dec 2003 14:02:02 -0000 1.20
+++ build.xml 10 Mar 2004 19:24:38 -0000 1.21
@@ -14,8 +14,8 @@
<fileset dir="${root.lib.dir}">
<include name="${framework.jar}"/>
<include name="${ext.dir}/*.jar"/>
+ <include name="${j2ee.dir}/*.jar"/>
</fileset>
- <pathelement location="${j2ee.jar.path}"/>
</path>
<target name="init">
<mkdir dir="${classes.dir}"/>
@@ -24,17 +24,7 @@
<delete dir="${classes.dir}"/>
</target>
- <target name="check-j2ee-jar">
- <available property="exists.j2ee.jar.path" type="file" file="${j2ee.jar.path}" />
- <fail unless="j2ee.jar.path"
- message="Property j2ee.jar.path not specified in config/build.properties."
- />
- <fail unless="exists.j2ee.jar.path"
- message="JAR ${j2ee.jar.path} (j2ee.jar.path from config/build.properties) does not exist."
- />
- </target>
-
- <target name="compile" depends="init,check-j2ee-jar"
+ <target name="compile" depends="init"
description="Compile all classes in the framework.">
<javac srcdir="${src.dir}" destdir="${classes.dir}" debug="on"
target="1.1">
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org