You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2005/06/30 00:16:41 UTC
svn commit: r202446 - in /myfaces/build/trunk: build.default.properties
build.xml
Author: schof
Date: Wed Jun 29 15:16:39 2005
New Revision: 202446
URL: http://svn.apache.org/viewcvs?rev=202446&view=rev
Log:
improvements to library determination
Modified:
myfaces/build/trunk/build.default.properties
myfaces/build/trunk/build.xml
Modified: myfaces/build/trunk/build.default.properties
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.default.properties?rev=202446&r1=202445&r2=202446&view=diff
==============================================================================
--- myfaces/build/trunk/build.default.properties (original)
+++ myfaces/build/trunk/build.default.properties Wed Jun 29 15:16:39 2005
@@ -1,81 +1,19 @@
-# These are the default build properties that normally need not be changed
+# These are local build properties
-# Don't forget to use double-backslashes in windows paths!
-
-# Project base dir
-project.dir = ${basedir}/..
-
-# Libraries
-commons-beanutils.jar = ${project.dir}/lib/commons-beanutils.jar
-commons-codec.jar = ${project.dir}/lib/commons-codec.jar
-commons-collections.jar = ${project.dir}/lib/commons-collections.jar
-commons-digester.jar = ${project.dir}/lib/commons-digester.jar
-commons-el.jar = ${project.dir}/lib/commons-el.jar
-commons-fileupload.jar = ${project.dir}/lib/commons-fileupload.jar
-commons-logging.jar = ${project.dir}/lib/commons-logging.jar
-commons-validator.jar = ${project.dir}/lib/commons-validator.jar
-jakarta-oro.jar = ${project.dir}/lib/jakarta-oro.jar
-jsp.jar = ${project.dir}/lib/jsp.jar
-jstl.jar = ${project.dir}/lib/jstl.jar
-portlet-api.jar = ${project.dir}/lib/portlet-api.jar
-servlet-api.jar = ${project.dir}/lib/servlet-api.jar
-struts.jar = ${project.dir}/lib/struts.jar
-tlddoc.jar = ${project.dir}/lib/tlddoc.jar
-xdoclet.jar = ${project.dir}/lib/xdoclet.jar
-xjavadoc.jar = ${project.dir}/lib/xjavadoc.jar
-
-# Destination file path of MyFaces JSF-API implementation archive to be created
-myfaces-jsf-api.jar = ${project.dir}/lib/myfaces-jsf-api.jar
-
-# Destination file path of MyFaces implementation archive to be created
-myfaces-impl.jar = ${project.dir}/lib/myfaces-impl.jar
-
-# Destination file path of MyFaces extensions archive to be created
-myfaces-extensions.jar = ${project.dir}/lib/myfaces-extensions.jar
-
-# Destination file path of MyFaces WML RenderKIt
-myfaces-wap.jar = ${project.dir}/lib/myfaces-wap.jar
-
-# Destination file path of MyFaces complete archive to be created
-myfaces.jar = ${project.dir}/lib/myfaces.jar
-
-# Compiler optimize and debug flags
-javac.optimize = off
-javac.debug = on
-
-# log4j library (only needed for examples application)
-log4j.jar = ${project.dir}/lib/optional/log4j.jar
-
-# junit library (only needed for JUnit testing)
-junit.jar = ${project.dir}/lib/cactus-1.7/junit-3.8.1.jar
-
-# Destination for JUnit test results
-test.results.dir=${project.dir}/test-results
-
-# Cactus libraries dir
-cactus.lib.dir=${project.dir}/lib/cactus-1.7
-
-# Tagunit libraries dir
-tagunit.lib.dir=${project.dir}/lib/tagunit-1.0.1
-
-# print summary when executing tests
-test.printsummary=false
-
-# Tomcat Build and Deploy Support
-tomcat.build.dir=${project.dir}/build/tomcat
-
-# Properties for Tomcat Server
-# Tomcat home and manager user and password must be set in build.properties (see build.properties.sample)
-tomcat.home=${env.CATALINA_HOME}
-tomcat.server=localhost
-tomcat.port=8080
-tomcat.manager.url=http://${tomcat.server}:${tomcat.port}/manager
-tomcat.manager.username=admin
-tomcat.manager.password=admin
-# Define the following tomcat.remote.deploy to deploy on a server that isn't local
-# tomcat.remote.deploy=true
-# Set this to true if you want to deploy the examples webapp on a tomcat version < 5.5
-tomcat.pre.5.5.version=true
-
-# Default forrest generation site dir
-site.build.dir=${project.dir}/../site
+commons-beanutils.jar = ${lib.dir}/commons-beanutils.jar
+commons-codec.jar = ${lib.dir}/commons-codec.jar
+commons-collections.jar = ${lib.dir}/commons-collections.jar
+commons-digester.jar = ${lib.dir}/commons-digester.jar
+commons-el.jar = ${lib.dir}/commons-el.jar
+commons-fileupload.jar = ${lib.dir}/commons-fileupload.jar
+commons-logging.jar = ${lib.dir}/commons-logging.jar
+commons-validator.jar = ${lib.dir}/commons-validator.jar
+jakarta-oro.jar = ${lib.dir}/jakarta-oro.jar
+jsp.jar = ${lib.dir}/lib/jsp.jar
+jstl.jar = ${lib.dir}/lib/jstl.jar
+portlet-api.jar = ${lib.dir}/lib/portlet-api.jar
+servlet-api.jar = ${lib.dir}/lib/servlet-api.jar
+struts.jar = ${lib.dir}/lib/struts.jar
+tlddoc.jar = ${lib.dir}/lib/tlddoc.jar
+xdoclet.jar = ${lib.dir}/lib/xdoclet.jar
+xjavadoc.jar = ${lib.dir}/lib/xjavadoc.jar
\ No newline at end of file
Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=202446&r1=202445&r2=202446&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Wed Jun 29 15:16:39 2005
@@ -56,10 +56,6 @@
package.
[Version 1.1.0 or later]
- log4j.jar The path to the JAR file for the log4j
- package.
- [Version 1.2.8 or later]
-
portlet-api.jar The path to the JAR file for the Portlet
API package.
[Version 1.0 or later]
@@ -131,16 +127,6 @@
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
<property name="share.src.dir" location="${basedir}/../../share/src/java"/>
-<!--
- <property file="build.default.properties"/>
--->
- <property file="../build.properties"/>
- <property file="manifest.properties"/>
-
- <!-- Load local and user build preferences -->
- <property file="build.local.properties"/>
- <property file="../../build/build.local.properties"/>
- <property file="${user.home}/build.properties"/>
<!--
Default values for unspecified subproject properties (keeps build from crashing
@@ -173,68 +159,60 @@
<property environment="env"/>
- <!-- ========== Derived Properties ======================================== -->
+ <!-- ========== Derived Properties ==================================== -->
<!--
These property values are derived from values defined above, and
generally should NOT be overridden by command line settings
-->
-
- <property name="project.dir" location="${basedir}/.."/>
- <property name="build.dir" location="${project.dir}/build"/>
- <property name="release.dir" location="${build.dir}/release"/>
- <property name="temp.dir" location="${build.dir}/temp"/>
- <property name="classes.dir" location="${temp.dir}/classes"/>
- <property name="dist.dir" location="${build.dir}/dist"/>
- <property name="javadoc.dir" location="${temp.dir}/javadoc"/>
- <property name="tlddoc.dir" location="${temp.dir}/tlddoc"/>
- <property name="tlddoc.dtd.dir" location="${build.dir}/tld-doc"/>
- <property name="tlddoc.xslt.dir" location="${build.dir}/tlddoc-xslt"/>
- <property name="tlddoc.dtd" location="${tlddoc.dtd.dir}/web-jsptaglibrary_1_2.dtd"/>
- <property name="sign.script" location="${release.dir}/sign.sh"/>
+ <available file="${basedir}/../build.properties" property="subproject.build"/>
+ <condition property="project.dir" value="${basedir}/../..">
+ <and>
+ <isset property="subproject.build"/>
+ </and>
+ </condition>
+ <condition property="project.dir" value="${basedir}/..">
+ <not>
+ <isset property="subproject.build"/>
+ </not>
+ </condition>
+
+ <property name="project.dir" location="${basedir}/.."/>
+ <property name="lib.dir" value="${project.dir}/lib" />
+ <property name="build.dir" location="${project.dir}/build"/>
+ <property name="release.dir" location="${build.dir}/release"/>
+ <property name="temp.dir" location="${build.dir}/temp"/>
+ <property name="classes.dir" location="${temp.dir}/classes"/>
+ <property name="dist.dir" location="${build.dir}/dist"/>
+ <property name="javadoc.dir" location="${temp.dir}/javadoc"/>
+ <property name="tlddoc.dir" location="${temp.dir}/tlddoc"/>
+ <property name="tlddoc.dtd.dir" location="${build.dir}/tld-doc"/>
+ <property name="tlddoc.xslt.dir" location="${build.dir}/tlddoc-xslt"/>
+ <property name="tlddoc.dtd" location="${tlddoc.dtd.dir}/web-jsptaglibrary_1_2.dtd"/>
+ <property name="sign.script" location="${release.dir}/sign.sh"/>
<property name="release.version" value="${manifest.impl.version}"/>
<property name="src.release.bundle" value="myfaces-${release.version}-src"/>
<property name="bin.release.bundle" value="myfaces-${release.version}"/>
<property name="examples.release.bundle" value="myfaces-${release.version}-examples"/>
<property name="tomahawk.release.bundle" value="tomahawk-${release.version}"/>
- <!-- This is only used if you execute "ant download-dependencies" -->
- <property name="lib.dir" value="${project.dir}/lib" />
-<!--
- <property name="project.home" location="${project.dir}"/>
- <property name="nightly.dir" location="${build.dir}/nightly"/>
- <property name="dist.dir" location="${build.dir}/dist"/>
- <property name="release.dir" location="${basedir}/release"/>
- <property name="jsfapi.src" location="${project.dir}/src/jsfapi"/>
- <property name="share.src" location="${project.dir}/src/share"/>
- <property name="myfaces.src" location="${project.dir}/src/myfaces"/>
- <property name="components.src" location="${project.dir}/src/components"/>
- <property name="cactus.src" location="${project.dir}/src/cactus"/>
- <property name="junit.src" location="${project.dir}/src/junit"/>
- <property name="doc.dir" location="${project.dir}/doc"/>
- <property name="webapp.dist.dir" location="${dist.dir}/webapp"/>
- <property name="conf.dir" location="${project.dir}/conf"/>
- <property name="apps.dir" location="${project.dir}/webapps"/>
- <property name="wml.src" location="${project.dir}/src/wml"/>
- <property name="xdoclet.src" location="${project.dir}/src/xdoclet"/>
- <property name="generated.src" location="${project.dir}/src/generated"/>
- <property name="sign.script" location="${release.dir}/sign.sh"/>
-
- <property name="release.version" value="${manifest.impl.version}"/>
- <property name="src.release.bundle" value="myfaces-${release.version}-src"/>
- <property name="bin.release.bundle" value="myfaces-${release.version}"/>
- <property name="app.release.bundle" value="myfaces-${release.version}-app"/>
-
- <property name="api.classes" location="${temp.dir}/myfaces-api/classes"/>
- <property name="share.classes" location="${temp.dir}/myfaces-share/classes"/>
- <property name="wml.classes" location="${temp.dir}/myfaces-wml/classes"/>
- <property name="xdoclet.classes" location="${temp.dir}/myfaces-xdoclet/classes"/>
- <property name="impl.classes" location="${temp.dir}/myfaces-impl/classes"/>
- <property name="components.classes" location="${temp.dir}/myfaces-components/classes"/>
+ <!-- ========== Configurable Subproject Properties ==================== -->
+
+ <property file="../build.properties"/>
+ <property file="manifest.properties"/>
--->
+ <!-- ========== User Supplied Properties ============================== -->
+
+ <property file="build.default.properties"/>
+ <!--
+ <property file="build.local.properties"/>
+ <property file="../../build/build.local.properties"/>
+ -->
+ <property file="${user.home}/build.properties"/>
+
+ <!-- ========== PATHS ================================================ -->
<!-- Compilation Classpath -->
<path id="compile.classpath">
@@ -336,10 +314,6 @@
usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/jstl/jars/jstl-1.1.0.jar"/>
- <get dest="${lib.dir}/log4j.jar"
- usetimestamp="true" ignoreerrors="true"
- src="http://www.ibiblio.org/maven/log4j/jars/log4j-1.2.8.jar"/>
-
<get dest="${lib.dir}/portlet-api.jar"
usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/portlet-api/jars/portlet-api-1.0.jar"/>
@@ -403,6 +377,7 @@
<property name="jsf-impl.jar" location="${basedir}/../impl/build/dist/myfaces-impl.jar"/>
<property name="api.classes.dir" location="${basedir}/../api/build/temp/classes/"/>
<property name="tomahawk.jar" location="${basedir}/../tomahawk/build/dist/tomahawk.jar"/>
+ <property name="sandbox.jar" location="${basedir}/../sandbox/build/dist/sandbox.jar"/>
<property name="share.src.dir" location="${basedir}/../share/src/java"/>
<property file="${basedir}/../${subproject}/build.properties"/>
</ant>
@@ -442,10 +417,10 @@
Compile current subproject
-->
<target name="compile" if="src.dir">
-<!--
+
<property name="cp" refid="compile.classpath"/>
<echo message="cp = ${cp}"/>
--->
+
<mkdir dir="${classes.dir}"/>
<javac srcdir="${src.dir}"
destdir="${classes.dir}"
@@ -596,11 +571,11 @@
Create distribution files for all subprojects
-->
<target name="dist-all">
- <!-- ******************* TEMPROARILY COMMENTED OUT: RESTORE WHEN DONE TESTING *******************
+ <!-- ******************* TEMPROARILY COMMENTED OUT: RESTORE WHEN DONE TESTING ******************* -->
<ant target="project">
<property name="target" value="dist"/>
</ant>
--->
+
<!-- create the myfaces-all.jar which contains everything -->
<mkdir dir="${dist.dir}"/>