A build.properties.jwsdp
build.properties file for JWSDP
A build.properties.tomcat
build.properties for use with standalone tomcat installation
M jsf-demo/default.properties
remove unused properties
M jsf-ri/systest/src/com/sun/faces/systest/ant/SystestClient.java
Make it easier to record golden files. Record a golden file if one
does not exist and recordGolden attribute is not null.
M jsf-ri/systest/web/subview04.jsp
Fix the page atrribute is <jsp:include> tag. Standalone tomcat caught
this but JWSDP didn't.
M jsf-ri/systest/web/golden/subview04.txt
Fix the golden file for the above test.
M jsf-tools/build.xml
Fix the hard coded path to java.endorsed.dir.
Remove properties dom.jar and sax.jar since they are not
being used.
Index: jsf-demo/default.properties
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-demo/default.properties,v
retrieving revision 1.12
diff -u -r1.12 default.properties
--- jsf-demo/default.properties 26 Aug 2004 22:52:27 -0000 1.12
+++ jsf-demo/default.properties 23 Sep 2004 22:12:11 -0000
@@ -52,13 +52,6 @@
commons-digester.jar=${tomcat.home}/jwsdp-shared/lib/commons-digester.jar
commons-beanutils.jar=${tomcat.home}/jwsdp-shared/lib/commons-beanutils.jar
commons-collections.jar=${tomcat.home}/jwsdp-shared/lib/commons-collections.jar
-commons-el.jar=${tomcat.home}/common/lib/commons-el.jar
-naming-resources.jar=${tomcat.home}/common/lib/naming-resources.jar
-naming-common.jar=${tomcat.home}/common/lib/naming-common.jar
-jasper-compiler.jar=${tomcat.home}/common/lib/jasper-compiler.jar
-jasper-runtime.jar=${tomcat.home}/common/lib/jasper-runtime.jar
-commons-modeler.jar=${tomcat.home}/server/lib/commons-modeler.jar
-jmx.jar=${tomcat.home}/common/lib/jmx.jar
jstl.jar=${tomcat.home}/jstl/lib/jstl.jar
standard.jar=${tomcat.home}/jstl/lib/standard.jar
servlet.jar=${tomcat.home}/common/lib/servlet-api.jar
Index: jsf-ri/systest/src/com/sun/faces/systest/ant/SystestClient.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/src/com/sun/faces/systest/ant/SystestClient.java,v
retrieving revision 1.10
diff -u -r1.10 SystestClient.java
--- jsf-ri/systest/src/com/sun/faces/systest/ant/SystestClient.java 12 May 2004 18:30:47 -0000 1.10
+++ jsf-ri/systest/src/com/sun/faces/systest/ant/SystestClient.java 23 Sep 2004 22:12:12 -0000
@@ -1235,7 +1235,7 @@
// write the goldenfile if the GF size from the server was 0
// and the goldenfile doesn't already exist on the local filesystem.
- if (saveGolden.size() == 0 && recordGolden != null) {
+ if (recordGolden != null) {
File gf = new File(recordGolden);
if (!gf.exists()) {
System.out.println(
Index: jsf-ri/systest/web/subview04.jsp
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/subview04.jsp,v
retrieving revision 1.3
diff -u -r1.3 subview04.jsp
--- jsf-ri/systest/web/subview04.jsp 4 Feb 2004 23:42:55 -0000 1.3
+++ jsf-ri/systest/web/subview04.jsp 23 Sep 2004 22:12:12 -0000
@@ -15,7 +15,8 @@
<body>
<h:outputText value="[A]"/>
<f:subview id="foo02">
-<jsp:include page="Begin test <c:include> with subview tag in including page"/>
+<h:outputText value="Begin test <c:include> with subview tag in including page"/>
+<jsp:include page="bar01.jsp"/>
</f:subview>
<h:outputText value="subview04"/>
<f:subview id="bar02">
Index: jsf-ri/systest/web/golden/subview04.txt
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/subview04.txt,v
retrieving revision 1.2
diff -u -r1.2 subview04.txt
--- jsf-ri/systest/web/golden/subview04.txt 5 Feb 2004 05:05:23 -0000 1.2
+++ jsf-ri/systest/web/golden/subview04.txt 23 Sep 2004 22:12:12 -0000
@@ -15,6 +15,19 @@
<body>
[A]
+Begin test <c:include> with subview tag in including page
+bar01<!--
+ Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+-->
+
+
+
+
+
+
+
+
subview04
Index: jsf-tools/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/build.xml,v
retrieving revision 1.34
diff -u -r1.34 build.xml
--- jsf-tools/build.xml 8 Sep 2004 17:56:01 -0000 1.34
+++ jsf-tools/build.xml 23 Sep 2004 22:12:12 -0000
@@ -36,8 +36,6 @@
<!-- The locations of necessary jar files -->
<property name="junit.jar"
value="${tomcat.home}/../junit3.8.1/junit.jar"/>
- <property name="ant.jar"
- value="${myenv.ANT_HOME}/lib/ant.jar" />
<property name="servlet.jar" value="${tomcat.home}/common/lib/servlet-api.jar"/>
<property name="jsp.jar" value="${tomcat.home}/common/lib/jsp-api.jar"/>
<property name="commons-logging.jar"
@@ -49,9 +47,7 @@
<property name="commons-beanutils.jar"
value="${tomcat.home}/jwsdp-shared/lib/commons-beanutils.jar"/>
<property name="xerces.jar" value="${tomcat.home}/jaxp/lib/endorsed/xercesImpl.jar"/>
- <property name="dom.jar" value="${tomcat.home}/jaxp/lib/endorsed/dom.jar"/>
- <property name="sax.jar" value="${tomcat.home}/jaxp/lib/endorsed/sax.jar"/>
- <property name="jaxp-api.jar" value="${tomcat.home}/jaxp/lib/jaxp-api.jar"/>
+ <property name="dom.jar.dir" value="${tomcat.home}/jaxp/lib/endorsed"/>
<property name="jcov.jar"
value="${tomcat.home}/../jcov/lib/jcov.jar"/>
@@ -84,7 +80,6 @@
<pathelement location="${build.classes}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${jsp.jar}"/>
- <pathelement location="${ant.jar}"/>
</path>
<path id="run.classpath">
@@ -98,8 +93,6 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${xerces.jar}"/>
- <pathelement location="${sax.jar}"/>
- <pathelement location="${jaxp-api.jar}"/>
</path>
<!--
@@ -173,14 +166,11 @@
<echo message="commons-collections.jar = ${commons-collections.jar}"/>
<echo message="commons-digester.jar = ${commons-digester.jar}"/>
<echo message="commons-logging.jar = ${commons-logging.jar}"/>
- <echo message="dom.jar = ${dom.jar}"/>
- <echo message="jaxp-api.jar = ${jaxp-api.jar}"/>
<echo message="jsp.jar = ${jsp.jar}"/>
- <echo message="junit.jar = ${junit.jar}"/>
- <echo message="sax.jar = ${sax.jar}"/>
+ <echo message="junit.jar = ${junit.jar}"/>
<echo message="servlet.jar = ${servlet.jar}"/>
<echo message="xerces.jar = ${xerces.jar}"/>
-
+ <echo message="dom.jar.dir = ${dom.jar.dir}"/>
</target>
<target name="generate.html"
@@ -194,12 +184,9 @@
<classpath refid="compile.classpath"/>
<classpath refid="run.classpath"/>
-
- <sysproperty key="java.endorsed.dirs"
- value="${tomcat.home}/jaxp/lib/endorsed"/>
-
- <sysproperty key="org.apache.commons.logging.Log"
- value="${log.impl}"/>
+
+ <sysproperty key="java.endorsed.dirs" value="${dom.jar.dir}"/>
+ <sysproperty key="org.apache.commons.logging.Log" value="${log.impl}"/>
<sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
value="info"/>
<sysproperty key="org.apache.commons.logging.simplelog.log.com.sun.faces"
@@ -233,11 +220,8 @@
destdir="${build.generate}" fork="yes"
copyright="${basedir}/COPYRIGHT"
tagdef="${basedir}/TAG-DEF">
- <sysproperty key="java.endorsed.dirs"
- value="${tomcat.home}/jaxp/lib/endorsed"/>
-
- <sysproperty key="org.apache.commons.logging.Log"
- value="${log.impl}"/>
+ <sysproperty key="java.endorsed.dirs" value="${dom.jar.dir}"/>
+ <sysproperty key="org.apache.commons.logging.Log" value="${log.impl}"/>
<sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
value="info"/>
<sysproperty key="org.apache.commons.logging.simplelog.log.com.sun.faces"
@@ -404,11 +388,8 @@
<jvmarg line="${debug.jvm.args}"/>
<classpath refid="compile.classpath"/>
<classpath refid="run.classpath"/>
-
- <sysproperty key="java.endorsed.dirs"
- value="${tomcat.home}/jaxp/lib/endorsed"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${log.impl}"/>
+ <sysproperty key="java.endorsed.dirs" value="${dom.jar.dir}"/>
+ <sysproperty key="org.apache.commons.logging.Log" value="${log.impl}"/>
<sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
value="info"/>
<sysproperty key="org.apache.commons.logging.simplelog.log.com.sun.faces"
# -----------------------------------------------------------------------------
# build.properties.sample
#
# This is an example "build.properties" file, used to customize building the
# javaserverfaces-sources for your local environment. It defines the location
# of all external modules that the javaserverfaces-source project relies on.
#
# $Id: build.properties.sample,v 1.2 2004/09/13 22:49:14 jayashri Exp $
# -----------------------------------------------------------------------------
# --------------------------------------------------
# BUILD REQUIRES ANT 1.6 OR ABOVE
# --------------------------------------------------
# ----- Compile Control Flags -----
compile.deprecation = true
compile.optimized = true
compile.debug = false
# --------------------------------------------------
# Path to JWSDP installation
# --------------------------------------------------
tomcat.home=
# --------------------------------------------------
# Required libraries to build API and RI
# --------------------------------------------------
# ----- Commons Library JARs
commons-logging.jar=${tomcat.home}/jwsdp-shared/lib/commons-logging.jar
commons-digester.jar=${tomcat.home}/jwsdp-shared/lib/commons-digester.jar
commons-beanutils.jar=${tomcat.home}/jwsdp-shared/lib/commons-beanutils.jar
commons-collections.jar=${tomcat.home}/jwsdp-shared/lib/commons-collections.jar
# ----- JSTL 1.0 or 1.1 Library JARs
jstl.jar=${tomcat.home}/jstl/lib/jstl.jar
standard.jar=${tomcat.home}/jstl/lib/standard.jar
# ----- JAXP implementation JAR
xerces.jar=${tomcat.home}/jaxp/lib/endorsed/xercesImpl.jar
# ----- Build Control Flags -----
# determines whether dependent library JARs are included with the generated WAR.
# By default all depedent jars are bundled with the application. If you don't
# want to do so, comment the following property and uncomment build.wspack
# property.
build.standalone = true
#build.wspack = true
# ----- Run Control Flags -----
# Define the arguments to give to the jvm to enable debugging
# If this is commented out, no debugging arguments will be passed.
# Make sure to uncomment the proper arguments for your platform.
# ----- Unix
#debug.jvm.args = -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
# ----- Windows
#debug.jvm.args = -Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=n
# ------------------------------------------------------------------------------
# Base Path for dependent library JARs not included with JWSDP.
# For simplicity, install these libraries in your home directory.
# JUnit 3.8.1
# HtmlUnit 1.2.3 or later
# MIF Doclet (
http://developer.java.sun.com/developer/earlyAccess/mifdoclet)
# Portlet API 1.0
# Jakarta Cactus version 13-1.4.1 or later.
# These libraries are required only if you want to run the test suites.
# ------------------------------------------------------------------------------
base.library.path=/home/user
mifdoclet.home=${base.library.path}/mifdoclet1.2
mifdoclet.jar=${mifdoclet.home}/lib/mifdoclet.jar
junit.home=${base.library.path}/junit3.8.1
junit.jar=${junit.home}/junit.jar
htmlunit.home=${base.library.path}/htmlunit-1.2.3
cactus.home=${base.library.path}/jakarta-cactus-13-1.4.1
cactus.lib=${cactus.home}/lib
cactus.jar=${cactus.lib}/cactus-1.4.1.jar
cactus.ant.jar=${cactus.lib}/cactus-ant-1.4.1.jar
httpclient.jar=${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar
aspectjrt.jar=${cactus.lib}/aspectjrt-1.0.5.jar
# --------------------------------------------------
# PATH TO PORTLET API and PLUTO INSTALLATION
# (OPTIONAL unless working with portlets)
# --------------------------------------------------
portlet-api.home=${base.library.path}/portlet1_0
portlet-api.jar=${portlet-api.home}/lib/portlet.jar
pluto.home=
# --------------------------------------------------
# Properties to access the JWSDP Manager application
# --------------------------------------------------
username=tomcat
password=tomcat
# -----------------------------------------------------------------------------
# build.properties.sample
#
# This is an example "build.properties" file, used to customize building the
# javaserverfaces-sources for your local environment. It defines the location
# of all external modules that the javaserverfaces-source project relies on.
#
# $Id: build.properties.sample,v 1.2 2004/09/13 22:49:14 jayashri Exp $
# -----------------------------------------------------------------------------
# --------------------------------------------------
# BUILD REQUIRES ANT 1.6 OR ABOVE
# --------------------------------------------------
# ----- Compile Control Flags -----
compile.deprecation = true
compile.optimized = true
compile.debug = false
# --------------------------------------------------
# Path to Tomcat 5.x installation
# --------------------------------------------------
tomcat.home=
# --------------------------------------------------
# Required libraries to build API and RI
# --------------------------------------------------
# ----- Commons Library JARs
commons-logging.jar=${tomcat.home}/bin/commons-logging-api.jar
commons-digester.jar=${tomcat.home}/server/lib/commons-digester.jar
commons-beanutils.jar=${tomcat.home}/server/lib/commons-beanutils.jar
commons-collections.jar=${tomcat.home}/common/lib/commons-collections.jar
# ----- JSTL 1.0 or 1.1 Library JARs
jsp.jar=${tomcat.home}/common/lib/jsp-api.jar
servlet.jar=${tomcat.home}/common/lib/servlet-api.jar
# ----- JAXP implementation JAR
xerces.jar=${tomcat.home}/common/endorsed/xercesImpl.jar
# ----- DOM implementation JAR
dom.jar.dir=${tomcat.home}/common/endorsed
dom.jar=${dom.jar.dir}/dom.jar
# ----- Build Control Flags -----
# determines whether dependent library JARs are included with the generated WAR.
# By default all depedent jars are bundled with the application. If you don't
# want to do so, comment the following property and uncomment build.wspack
# property.
build.standalone = true
#build.wspack = true
# ----- Run Control Flags -----
# Define the arguments to give to the jvm to enable debugging
# If this is commented out, no debugging arguments will be passed.
# Make sure to uncomment the proper arguments for your platform.
# ----- Unix
#debug.jvm.args = -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
# ----- Windows
#debug.jvm.args = -Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=n
# ------------------------------------------------------------------------------
# Base Path for dependent library JARs not included with JWSDP.
# For simplicity, install these libraries in your home directory.
# JUnit 3.8.1
# HtmlUnit 1.2.3 or later
# MIF Doclet (
http://developer.java.sun.com/developer/earlyAccess/mifdoclet)
# Portlet API 1.0
# Jakarta Cactus version 13-1.4.1 or later.
# These libraries are required only if you want to run the test suites.
# ------------------------------------------------------------------------------
base.library.path=/home/user
mifdoclet.home=${base.library.path}/mifdoclet1.2
mifdoclet.jar=${mifdoclet.home}/lib/mifdoclet.jar
junit.home=${base.library.path}/junit3.8.1
junit.jar=${junit.home}/junit.jar
htmlunit.home=${base.library.path}/htmlunit-1.2.3
cactus.home=${base.library.path}/jakarta-cactus-13-1.4.1
cactus.lib=${cactus.home}/lib
cactus.jar=${cactus.lib}/cactus-1.4.1.jar
cactus.ant.jar=${cactus.lib}/cactus-ant-1.4.1.jar
httpclient.jar=${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar
aspectjrt.jar=${cactus.lib}/aspectjrt-1.0.5.jar
# --------------------------------------------------
# PATH TO PORTLET API and PLUTO INSTALLATION
# (OPTIONAL unless working with portlets)
# --------------------------------------------------
portlet-api.home=${base.library.path}/portlet1_0
portlet-api.jar=${portlet-api.home}/lib/portlet.jar
pluto.home=
# --------------------------------------------------
# Properties to access the Tomcat Manager application
# --------------------------------------------------
username=tomcat
password=tomcat
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net