dev@javaserverfaces.java.net

Re: [REVIEW] Dependency package changes

From: Ryan Lubke <Ryan.Lubke_at_Sun.COM>
Date: Mon, 06 Mar 2006 08:26:11 -0800

Please ignore the change to MethodExpressionActionListener. I didn't
intend for that to make it in.

Ryan Lubke wrote:
>
> ------------------------------------------------------------------------
>
> In order to avoid classloader conflicts in GlassFish with
> Jakarta Commons packages defined in the application classloader
> with the same packages defined in the web application classloader,
> it was decided to take the Jakarta Commons dependencies
> and rename the packages to com.sun.org.apache.*.
>
> I've added the JARs:
> com-sun-commons-beanutils.jar
> com-sun-commons-digester.jar
> com-sun-commons-logging-api.jar
> com-sun-commons-collections.jar
> to the repository (only temporary until I have time
> to muck with the maven stuff).
>
> These jars are now referenced by the classpath refid
> 'sun.commons.classpath'.
>
> Also, when building jsf-impl.jar, the content of these
> JARs is included as well.
>
>
> SECTION: Modified Files
> ----------------------------
> M common/ant/common.xml
> M common/ant/glassfish/container.xml
> M common/ant/template/container.xml
> M jsf-api/build.xml
> M jsf-api/src/javax/faces/LogStrings.properties
> M jsf-api/src/javax/faces/event/MethodExpressionActionListener.java
> M jsf-api/test/javax/faces/model/DataModelTestCaseBase.java
> M jsf-api/test/javax/faces/webapp/ConfigFileTestCase.java
> M jsf-ri/build.xml
> M jsf-ri/src/com/sun/faces/config/ConfigureListener.java
> M jsf-ri/src/com/sun/faces/config/ManagedBeanFactoryImpl.java
> M jsf-ri/test/com/sun/faces/config/ConfigFileTestCase.java
> M jsf-tools/src/com/sun/faces/config/DigesterFactory.java
> M jsf-tools/src/com/sun/faces/config/rules/ApplicationRule.java
> M jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java
> M jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java
> M jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java
> M jsf-tools/src/com/sun/faces/config/rules/DescriptionRule.java
> M jsf-tools/src/com/sun/faces/config/rules/DescriptionTextRule.java
> M jsf-tools/src/com/sun/faces/config/rules/DisplayNameRule.java
> M jsf-tools/src/com/sun/faces/config/rules/FacesConfigRule.java
> M jsf-tools/src/com/sun/faces/config/rules/FacesConfigRuleSet.java
> M jsf-tools/src/com/sun/faces/config/rules/FactoryRule.java
> M jsf-tools/src/com/sun/faces/config/rules/FeatureRule.java
> M jsf-tools/src/com/sun/faces/config/rules/IconRule.java
> M jsf-tools/src/com/sun/faces/config/rules/LifecycleRule.java
> M jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java
> M jsf-tools/src/com/sun/faces/config/rules/LocaleConfigRule.java
> M jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java
> M jsf-tools/src/com/sun/faces/config/rules/MapEntryRule.java
> M jsf-tools/src/com/sun/faces/config/rules/NavigationCaseRule.java
> M jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java
> M jsf-tools/src/com/sun/faces/config/rules/NullValueRule.java
> M jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java
> M jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java
> M jsf-tools/src/com/sun/faces/config/rules/RenderKitRule.java
> M jsf-tools/src/com/sun/faces/config/rules/RendererRule.java
> M jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java
> M jsf-tools/src/com/sun/faces/generate/GeneratorUtil.java
>
>
> A common/lib/com-sun-commons-beanutils.jar
> A common/lib/com-sun-commons-digester.jar
> A common/lib/com-sun-commons-logging-api.jar
> A common/lib/com-sun-commons-collections.jar
>
>
> SECTION: Diffs
> ----------------------------
> Index: common/ant/common.xml
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/common/ant/common.xml,v
> retrieving revision 1.12
> diff -u -r1.12 common.xml
> --- common/ant/common.xml 24 Feb 2006 21:15:48 -0000 1.12
> +++ common/ant/common.xml 6 Mar 2006 16:12:50 -0000
> @@ -115,14 +115,14 @@
> <fileset dir="${htmlunit.home}/lib" includes="*.jar"/>
> </path>
>
> + <!-- Make sure to compile/run with the special cactus jar
> + in our source repository, rather than the stock version -->
> <path id="cactus.compile.classpath">
> <path refid="junit.classpath"/>
> + <fileset dir="${jsf.build.home}/lib" includes="cactus-*.jar"/>
> <fileset dir="${cactus.home}/lib" includes="cactus-*.jar"
> excludes="*ant*.jar"/>
> - </path>
> -
> - <!-- Make sure to run with the special cactus jar
> - in our source repository, rather than the stock version -->
> + </path>
>
> <path id="cactus.runtime.classpath">
> <path refid="junit.classpath"/>
> @@ -130,6 +130,11 @@
> excludes="cactus-1.7.1.jar"/>
> <fileset dir="${jsf.build.home}/lib" includes="cactus-*.jar"/>
> </path>
> +
> + <path id="sun.commons.classpath">
> + <fileset dir="${jsf.build.home}/common/lib"
> + includes="com-sun-commons*.jar"/>
> + </path>
>
> <!-- Common Targets -->
>
> @@ -267,12 +272,13 @@
>
> <sequential>
> <mkdir dir="${tools.dir}/build/classes"/>
> - <javac srcdir="${tools.dir}/src"
> + <jsf.javac srcdir="${tools.dir}/src"
> destdir="${tools.dir}/build/classes">
> <classpath>
> - <path refid="compile.classpath"/>
> + <path refid="compile.classpath"/>
> + <path refid="sun.commons.classpath"/>
> </classpath>
> - </javac>
> + </jsf.javac>
> <taskdef name="generateComponents"
> classname="com.sun.faces.ant.ComponentGenTask">
> <classpath>
> Index: common/ant/glassfish/container.xml
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/common/ant/glassfish/container.xml,v
> retrieving revision 1.6
> diff -u -r1.6 container.xml
> --- common/ant/glassfish/container.xml 2 Feb 2006 16:53:19 -0000 1.6
> +++ common/ant/glassfish/container.xml 6 Mar 2006 16:12:50 -0000
> @@ -30,8 +30,7 @@
> <path id="compile.classpath">
> <pathelement location="${container.home}/lib/javaee.jar"/>
> <pathelement location="${container.home}/lib/appserv-rt.jar"/>
> - <pathelement location="${container.home}/lib/appserv-jstl.jar"/>
> - <pathelement location="${container.home}/lib/commons-logging.jar"/>
> + <pathelement location="${container.home}/lib/appserv-jstl.jar"/>
> </path>
>
> <!-- JARs that may be packaged in WEB-INF/lib
> Index: common/ant/template/container.xml
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/common/ant/template/container.xml,v
> retrieving revision 1.3
> diff -u -r1.3 container.xml
> --- common/ant/template/container.xml 31 Jan 2006 01:58:36 -0000 1.3
> +++ common/ant/template/container.xml 6 Mar 2006 16:12:50 -0000
> @@ -30,10 +30,7 @@
> This definition should include all
> the compile dependencies required
> by Sun's Javaserver Faces implementation.
> -
> - commons-digester (version 1.5)
> - commons-beanutils (version 1.6.1)
> - commons-logging (latest)
> +
> Servlet (version 2.5)
> JSP (version 2.1)
> JSTL (version 1.2)
> Index: jsf-api/build.xml
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-api/build.xml,v
> retrieving revision 1.165
> diff -u -r1.165 build.xml
> --- jsf-api/build.xml 22 Feb 2006 21:56:52 -0000 1.165
> +++ jsf-api/build.xml 6 Mar 2006 16:12:50 -0000
> @@ -66,6 +66,7 @@
> <pathelement location="${build.test.dir}"/>
> <pathelement location="${jsf.test.jar}"/>
> <pathelement location="${tools.dir}/build/classes"/>
> + <path refid="sun.commons.classpath"/>
> <path refid="compile.classpath"/>
> <path refid="junit.classpath"/>
> </path>
> @@ -231,6 +232,7 @@
> destdir="${tools.dir}/build/classes">
> <classpath>
> <path refid="compile.classpath"/>
> + <path refid="sun.commons.classpath"/>
> <path refid="ant.classpath"/>
> </classpath>
> </jsf.javac>
> @@ -327,6 +329,7 @@
> destdir="${build.test.dir}">
> <classpath>
> <path refid="test.classpath"/>
> + <path refid="sun.commons.classpath"/>
> </classpath>
> </jsf.javac>
>
> Index: jsf-api/src/javax/faces/LogStrings.properties
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-api/src/javax/faces/LogStrings.properties,v
> retrieving revision 1.1
> diff -u -r1.1 LogStrings.properties
> --- jsf-api/src/javax/faces/LogStrings.properties 22 Feb 2006 21:56:51 -0000 1.1
> +++ jsf-api/src/javax/faces/LogStrings.properties 6 Mar 2006 16:12:50 -0000
> @@ -28,7 +28,7 @@
> # [level].[base package].[message_id]
>
> # Common -----------------------------------------------------------------------
> -
> +user.informational.error_processing_page=An unexpected error occurred while processing your request. Please contact the application administrator.
>
> # PACKAGE javax.faces ----------------------------------------------------------
>
> @@ -49,7 +49,7 @@
>
>
> # PACKAGE javax.faces.event ----------------------------------------------------
> -severe.event.exception_invoking_processaction="Received ''{0}'' when invoking action listener ''{1}'' for component ''{2}''
> +severe.event.exception_invoking_processaction=Received ''{0}'' when invoking action listener ''{1}'' for component ''{2}''
>
> # PACKAGE javax.faces.lifecycle ------------------------------------------------
>
> Index: jsf-api/src/javax/faces/event/MethodExpressionActionListener.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-api/src/javax/faces/event/MethodExpressionActionListener.java,v
> retrieving revision 1.4
> diff -u -r1.4 MethodExpressionActionListener.java
> --- jsf-api/src/javax/faces/event/MethodExpressionActionListener.java 22 Feb 2006 21:56:51 -0000 1.4
> +++ jsf-api/src/javax/faces/event/MethodExpressionActionListener.java 6 Mar 2006 16:12:51 -0000
> @@ -29,16 +29,18 @@
>
> package javax.faces.event;
>
> -import javax.el.ELContext;
> import javax.el.ELException;
> import javax.el.MethodExpression;
> -import javax.faces.context.FacesContext;
> +import javax.faces.application.FacesMessage;
> +import javax.faces.application.FacesMessage.Severity;
> import javax.faces.component.StateHolder;
> +import javax.faces.context.FacesContext;
>
> +import java.text.MessageFormat;
> +import java.util.ResourceBundle;
> import java.util.logging.Level;
> import java.util.logging.Logger;
> -import java.io.StringWriter;
> -import java.io.PrintWriter;
> +import java.beans.Beans;
>
> /**
> * <p><strong>MethodExpressionActionListener</strong> is an {_at_link ActionListener} that
> @@ -51,7 +53,7 @@
>
> private static final Logger LOGGER =
> Logger.getLogger("javax.faces.event", "javax.faces.LogStrings");
> -
> +
>
> // ------------------------------------------------------ Instance Variables
>
> @@ -82,22 +84,32 @@
> if (actionEvent == null) {
> throw new NullPointerException();
> }
> + FacesContext context = FacesContext.getCurrentInstance();
> try {
> - FacesContext context = FacesContext.getCurrentInstance();
> - ELContext elContext = context.getELContext();
> - methodExpression.invoke(elContext, new Object[] {actionEvent});
> +
> + methodExpression.invoke(context.getELContext(),
> + new Object[] {actionEvent});
> } catch (ELException ee) {
> - if (LOGGER.isLoggable(Level.SEVERE)) {
> - LOGGER.log(Level.SEVERE,
> - "severe.event.exception_invoking_processaction",
> - new Object[]{
> - ee.getCause().getClass().getName(),
> - methodExpression.getExpressionString(),
> - actionEvent.getComponent().getId()
> - });
> - StringWriter writer = new StringWriter(1024);
> - ee.getCause().printStackTrace(new PrintWriter(writer));
> - LOGGER.severe(writer.toString());
> +// ResourceBundle bundle = LOGGER.getResourceBundle();
> +// String summaryMessage =
> +// bundle.getString("user.informational.error_processing_page");
> +// String detailMessage = MessageFormat.format(
> +// bundle.getString(
> +// "severe.event.exception_invoking_processaction"),
> +// ee.getCause().getClass().getName(),
> +// methodExpression.getExpressionString(),
> +// actionEvent.getComponent().getId()
> +// );
> +// if (LOGGER.isLoggable(Level.SEVERE)) {
> +// LOGGER.log(Level.SEVERE, detailMessage, ee.getCause());
> +// }
> +// FacesMessage fMessage = new FacesMessage(FacesMessage.SEVERITY_ERROR,
> +// summaryMessage,
> +// detailMessage);
> +// context.addMessage(actionEvent.getComponent().getClientId(context),
> +// fMessage);
> + if (ee.getCause() instanceof RuntimeException) {
> + throw ((RuntimeException) ee.getCause());
> }
> throw new AbortProcessingException(ee.getMessage(), ee.getCause());
> }
> Index: jsf-api/test/javax/faces/model/DataModelTestCaseBase.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-api/test/javax/faces/model/DataModelTestCaseBase.java,v
> retrieving revision 1.11
> diff -u -r1.11 DataModelTestCaseBase.java
> --- jsf-api/test/javax/faces/model/DataModelTestCaseBase.java 22 Aug 2005 22:08:27 -0000 1.11
> +++ jsf-api/test/javax/faces/model/DataModelTestCaseBase.java 6 Mar 2006 16:12:51 -0000
> @@ -38,7 +38,7 @@
> import junit.framework.TestCase;
> import junit.framework.Test;
> import junit.framework.TestSuite;
> -import org.apache.commons.beanutils.PropertyUtils;
> +import com.sun.org.apache.commons.beanutils.PropertyUtils;
>
>
> /**
> Index: jsf-api/test/javax/faces/webapp/ConfigFileTestCase.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-api/test/javax/faces/webapp/ConfigFileTestCase.java,v
> retrieving revision 1.9
> diff -u -r1.9 ConfigFileTestCase.java
> --- jsf-api/test/javax/faces/webapp/ConfigFileTestCase.java 22 Aug 2005 22:08:31 -0000 1.9
> +++ jsf-api/test/javax/faces/webapp/ConfigFileTestCase.java 6 Mar 2006 16:12:51 -0000
> @@ -42,7 +42,7 @@
> import junit.framework.Test;
> import junit.framework.TestSuite;
>
> -import org.apache.commons.digester.Digester;
> +import com.sun.org.apache.commons.digester.Digester;
>
> import org.xml.sax.InputSource;
> import com.sun.faces.config.DigesterFactory;
> Index: jsf-ri/build.xml
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-ri/build.xml,v
> retrieving revision 1.205
> diff -u -r1.205 build.xml
> --- jsf-ri/build.xml 10 Feb 2006 22:29:00 -0000 1.205
> +++ jsf-ri/build.xml 6 Mar 2006 16:12:51 -0000
> @@ -62,7 +62,8 @@
>
> <path id="impl.compile.classpath">
> <pathelement location="${jsf-api.jar}"/>
> - <path refid="compile.classpath"/>
> + <path refid="sun.commons.classpath"/>
> + <path refid="compile.classpath"/>
> </path>
>
>
> @@ -399,9 +400,14 @@
> -->
>
> <target name="jars" depends="compile,create.runtime.config">
> + <unjar dest="${build.classes.dir}">
> + <fileset dir="${jsf.build.home}/common/lib"
> + includes="com-sun-commons*.jar"/>
> + </unjar>
> <jsf.manifested.jar jarfile="${build.dir}/lib/${name}.jar"
> basedir="${build.classes.dir}"
> - extension-name="com.sun.faces"/>
> + extension-name="com.sun.faces"/>
> + <delete dir="${build.classes.dir}/com/sun/org"/>
> </target>
>
> <target name="main" depends="jars"/>
> Index: jsf-ri/src/com/sun/faces/config/ConfigureListener.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/config/ConfigureListener.java,v
> retrieving revision 1.63
> diff -u -r1.63 ConfigureListener.java
> --- jsf-ri/src/com/sun/faces/config/ConfigureListener.java 24 Feb 2006 20:39:44 -0000 1.63
> +++ jsf-ri/src/com/sun/faces/config/ConfigureListener.java 6 Mar 2006 16:12:51 -0000
> @@ -101,7 +101,7 @@
> import com.sun.faces.util.Util;
> import com.sun.faces.util.MessageUtils;
>
> -import org.apache.commons.digester.Digester;
> +import com.sun.org.apache.commons.digester.Digester;
> import org.xml.sax.Attributes;
> import org.xml.sax.InputSource;
> import org.xml.sax.SAXException;
> Index: jsf-ri/src/com/sun/faces/config/ManagedBeanFactoryImpl.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/config/ManagedBeanFactoryImpl.java,v
> retrieving revision 1.7
> diff -u -r1.7 ManagedBeanFactoryImpl.java
> --- jsf-ri/src/com/sun/faces/config/ManagedBeanFactoryImpl.java 21 Feb 2006 20:37:50 -0000 1.7
> +++ jsf-ri/src/com/sun/faces/config/ManagedBeanFactoryImpl.java 6 Mar 2006 16:12:51 -0000
> @@ -59,7 +59,7 @@
> import com.sun.faces.util.Util;
> import com.sun.faces.util.MessageUtils;
>
> -import org.apache.commons.beanutils.PropertyUtils;
> +import com.sun.org.apache.commons.beanutils.PropertyUtils;
>
> /**
> * <p>This class creates a managed bean instance. It has a contract with
> Index: jsf-ri/test/com/sun/faces/config/ConfigFileTestCase.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/config/ConfigFileTestCase.java,v
> retrieving revision 1.71
> diff -u -r1.71 ConfigFileTestCase.java
> --- jsf-ri/test/com/sun/faces/config/ConfigFileTestCase.java 14 Dec 2005 22:27:59 -0000 1.71
> +++ jsf-ri/test/com/sun/faces/config/ConfigFileTestCase.java 6 Mar 2006 16:12:52 -0000
> @@ -35,7 +35,7 @@
> import com.sun.faces.config.beans.FacesConfigBean;
> import com.sun.faces.util.Util;
> import org.apache.cactus.WebRequest;
> -import org.apache.commons.digester.Digester;
> +import com.sun.org.apache.commons.digester.Digester;
>
> import javax.faces.FactoryFinder;
> import javax.faces.application.ApplicationFactory;
> Index: jsf-tools/src/com/sun/faces/config/DigesterFactory.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/DigesterFactory.java,v
> retrieving revision 1.10
> diff -u -r1.10 DigesterFactory.java
> --- jsf-tools/src/com/sun/faces/config/DigesterFactory.java 24 Feb 2006 18:05:07 -0000 1.10
> +++ jsf-tools/src/com/sun/faces/config/DigesterFactory.java 6 Mar 2006 16:12:52 -0000
> @@ -37,8 +37,8 @@
> import java.util.logging.Level;
> import java.util.logging.Logger;
>
> -import org.apache.commons.digester.Digester;
> -import org.apache.commons.logging.impl.NoOpLog;
> +import com.sun.org.apache.commons.digester.Digester;
> +import com.sun.org.apache.commons.logging.impl.NoOpLog;
> import org.xml.sax.ErrorHandler;
> import org.xml.sax.InputSource;
> import org.xml.sax.SAXException;
> Index: jsf-tools/src/com/sun/faces/config/rules/ApplicationRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ApplicationRule.java,v
> retrieving revision 1.4
> diff -u -r1.4 ApplicationRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/ApplicationRule.java 22 Aug 2005 22:12:19 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/config/rules/ApplicationRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.ApplicationBean;
> import com.sun.faces.config.beans.FacesConfigBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java,v
> retrieving revision 1.6
> diff -u -r1.6 AttributeRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java 22 Aug 2005 22:12:19 -0000 1.6
> +++ jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.AttributeBean;
> import com.sun.faces.config.beans.AttributeHolder;
> Index: jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java,v
> retrieving revision 1.6
> diff -u -r1.6 ComponentRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java 22 Aug 2005 22:12:19 -0000 1.6
> +++ jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.ComponentBean;
> import com.sun.faces.config.beans.FacesConfigBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java,v
> retrieving revision 1.6
> diff -u -r1.6 ConverterRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java 22 Aug 2005 22:12:19 -0000 1.6
> +++ jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.ConverterBean;
> import com.sun.faces.config.beans.FacesConfigBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/DescriptionRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/DescriptionRule.java,v
> retrieving revision 1.4
> diff -u -r1.4 DescriptionRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/DescriptionRule.java 22 Aug 2005 22:12:20 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/config/rules/DescriptionRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.DescriptionBean;
> import com.sun.faces.config.beans.FeatureBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/DescriptionTextRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/DescriptionTextRule.java,v
> retrieving revision 1.5
> diff -u -r1.5 DescriptionTextRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/DescriptionTextRule.java 22 Aug 2005 22:12:20 -0000 1.5
> +++ jsf-tools/src/com/sun/faces/config/rules/DescriptionTextRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,8 +30,8 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.NodeCreateRule;
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.NodeCreateRule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.w3c.dom.NamedNodeMap;
> import org.w3c.dom.Node;
> import org.w3c.dom.NodeList;
> Index: jsf-tools/src/com/sun/faces/config/rules/DisplayNameRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/DisplayNameRule.java,v
> retrieving revision 1.4
> diff -u -r1.4 DisplayNameRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/DisplayNameRule.java 22 Aug 2005 22:12:20 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/config/rules/DisplayNameRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.DisplayNameBean;
> import com.sun.faces.config.beans.FeatureBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/FacesConfigRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/FacesConfigRule.java,v
> retrieving revision 1.4
> diff -u -r1.4 FacesConfigRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/FacesConfigRule.java 22 Aug 2005 22:12:20 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/config/rules/FacesConfigRule.java 6 Mar 2006 16:12:52 -0000
> @@ -31,7 +31,7 @@
>
>
> import com.sun.faces.config.beans.FacesConfigBean;
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
>
>
> Index: jsf-tools/src/com/sun/faces/config/rules/FacesConfigRuleSet.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/FacesConfigRuleSet.java,v
> retrieving revision 1.11
> diff -u -r1.11 FacesConfigRuleSet.java
> --- jsf-tools/src/com/sun/faces/config/rules/FacesConfigRuleSet.java 14 Oct 2005 22:14:38 -0000 1.11
> +++ jsf-tools/src/com/sun/faces/config/rules/FacesConfigRuleSet.java 6 Mar 2006 16:12:52 -0000
> @@ -33,8 +33,8 @@
> import com.sun.faces.util.ToolsUtil;
> import java.util.logging.Level;
> import java.util.logging.Logger;
> -import org.apache.commons.digester.Digester;
> -import org.apache.commons.digester.RuleSetBase;
> +import com.sun.org.apache.commons.digester.Digester;
> +import com.sun.org.apache.commons.digester.RuleSetBase;
>
>
>
> Index: jsf-tools/src/com/sun/faces/config/rules/FactoryRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/FactoryRule.java,v
> retrieving revision 1.4
> diff -u -r1.4 FactoryRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/FactoryRule.java 22 Aug 2005 22:12:21 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/config/rules/FactoryRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.FactoryBean;
> import com.sun.faces.config.beans.FacesConfigBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/FeatureRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/FeatureRule.java,v
> retrieving revision 1.4
> diff -u -r1.4 FeatureRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/FeatureRule.java 22 Aug 2005 22:12:21 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/config/rules/FeatureRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.DescriptionBean;
> import com.sun.faces.config.beans.DisplayNameBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/IconRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/IconRule.java,v
> retrieving revision 1.4
> diff -u -r1.4 IconRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/IconRule.java 22 Aug 2005 22:12:21 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/config/rules/IconRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.FeatureBean;
> import com.sun.faces.config.beans.IconBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/LifecycleRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/LifecycleRule.java,v
> retrieving revision 1.4
> diff -u -r1.4 LifecycleRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/LifecycleRule.java 22 Aug 2005 22:12:21 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/config/rules/LifecycleRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.LifecycleBean;
> import com.sun.faces.config.beans.FacesConfigBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java,v
> retrieving revision 1.6
> diff -u -r1.6 ListEntriesRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java 22 Aug 2005 22:12:21 -0000 1.6
> +++ jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.ListEntriesBean;
> import com.sun.faces.config.beans.ListEntriesHolder;
> Index: jsf-tools/src/com/sun/faces/config/rules/LocaleConfigRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/LocaleConfigRule.java,v
> retrieving revision 1.4
> diff -u -r1.4 LocaleConfigRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/LocaleConfigRule.java 22 Aug 2005 22:12:21 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/config/rules/LocaleConfigRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.ApplicationBean;
> import com.sun.faces.config.beans.LocaleConfigBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java,v
> retrieving revision 1.6
> diff -u -r1.6 MapEntriesRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java 22 Aug 2005 22:12:21 -0000 1.6
> +++ jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.MapEntriesBean;
> import com.sun.faces.config.beans.MapEntriesHolder;
> Index: jsf-tools/src/com/sun/faces/config/rules/MapEntryRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/MapEntryRule.java,v
> retrieving revision 1.5
> diff -u -r1.5 MapEntryRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/MapEntryRule.java 22 Aug 2005 22:12:22 -0000 1.5
> +++ jsf-tools/src/com/sun/faces/config/rules/MapEntryRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.MapEntriesBean;
> import com.sun.faces.config.beans.MapEntryBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/NavigationCaseRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/NavigationCaseRule.java,v
> retrieving revision 1.5
> diff -u -r1.5 NavigationCaseRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/NavigationCaseRule.java 22 Aug 2005 22:12:22 -0000 1.5
> +++ jsf-tools/src/com/sun/faces/config/rules/NavigationCaseRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.NavigationCaseBean;
> import com.sun.faces.config.beans.NavigationRuleBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java,v
> retrieving revision 1.6
> diff -u -r1.6 NavigationRuleRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java 22 Aug 2005 22:12:22 -0000 1.6
> +++ jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.NavigationCaseBean;
> import com.sun.faces.config.beans.NavigationRuleBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/NullValueRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/NullValueRule.java,v
> retrieving revision 1.4
> diff -u -r1.4 NullValueRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/NullValueRule.java 22 Aug 2005 22:12:22 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/config/rules/NullValueRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.NullValueHolder;
> import com.sun.faces.config.beans.FacesConfigBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java,v
> retrieving revision 1.6
> diff -u -r1.6 PropertyRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java 22 Aug 2005 22:12:22 -0000 1.6
> +++ jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.PropertyBean;
> import com.sun.faces.config.beans.PropertyHolder;
> Index: jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java,v
> retrieving revision 1.6
> diff -u -r1.6 ReferencedBeanRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java 22 Aug 2005 22:12:22 -0000 1.6
> +++ jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.FacesConfigBean;
> import com.sun.faces.config.beans.ReferencedBeanBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/RenderKitRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/RenderKitRule.java,v
> retrieving revision 1.5
> diff -u -r1.5 RenderKitRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/RenderKitRule.java 22 Aug 2005 22:12:22 -0000 1.5
> +++ jsf-tools/src/com/sun/faces/config/rules/RenderKitRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.FacesConfigBean;
> import com.sun.faces.config.beans.RenderKitBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/RendererRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/RendererRule.java,v
> retrieving revision 1.7
> diff -u -r1.7 RendererRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/RendererRule.java 22 Aug 2005 22:12:23 -0000 1.7
> +++ jsf-tools/src/com/sun/faces/config/rules/RendererRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.RendererBean;
> import com.sun.faces.config.beans.RenderKitBean;
> Index: jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java,v
> retrieving revision 1.6
> diff -u -r1.6 ValidatorRule.java
> --- jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java 22 Aug 2005 22:12:23 -0000 1.6
> +++ jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java 6 Mar 2006 16:12:52 -0000
> @@ -30,7 +30,7 @@
> package com.sun.faces.config.rules;
>
>
> -import org.apache.commons.digester.Rule;
> +import com.sun.org.apache.commons.digester.Rule;
> import org.xml.sax.Attributes;
> import com.sun.faces.config.beans.FacesConfigBean;
> import com.sun.faces.config.beans.ValidatorBean;
> Index: jsf-tools/src/com/sun/faces/generate/GeneratorUtil.java
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/generate/GeneratorUtil.java,v
> retrieving revision 1.4
> diff -u -r1.4 GeneratorUtil.java
> --- jsf-tools/src/com/sun/faces/generate/GeneratorUtil.java 25 Aug 2005 17:11:02 -0000 1.4
> +++ jsf-tools/src/com/sun/faces/generate/GeneratorUtil.java 6 Mar 2006 16:12:52 -0000
> @@ -46,7 +46,7 @@
> import com.sun.faces.config.rules.FacesConfigRuleSet;
>
> import org.xml.sax.InputSource;
> -import org.apache.commons.digester.Digester;
> +import com.sun.org.apache.commons.digester.Digester;
>
> /**
> * <p>Utility methods that may be useful to all <code>Generators</code>.</p>
>
>
> SECTION: New Files
> ----------------------------
> SEE ATTACHMENTS
>
>
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
> For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net
>