[ajax4jsf-svn-commits] JBoss Ajax4JSF SVN: r181 - in branches/version_1_0_7/src: framework/generate and 2 other directories.
ajax4jsf-svn-commits at lists.jboss.org
ajax4jsf-svn-commits at lists.jboss.org
Mon May 7 15:58:03 EDT 2007
Author: alexsmirnov
Date: 2007-05-07 15:58:03 -0400 (Mon, 07 May 2007)
New Revision: 181
Modified:
branches/version_1_0_7/src/cdk/META-INF/templates/facelets.taglib.vm
branches/version_1_0_7/src/cdk/META-INF/templates/faces-config.vm
branches/version_1_0_7/src/cdk/META-INF/templates/taglib.vm
branches/version_1_0_7/src/framework/generate/ajax.xml
branches/version_1_0_7/src/framework/generate/build.xml
branches/version_1_0_7/src/framework/generate/merge.xsl
branches/version_1_0_7/src/framework/generate/templates/facelets.taglib.vm
branches/version_1_0_7/src/framework/generate/templates/faces-config.vm
branches/version_1_0_7/src/framework/generate/templates/taglib.vm
branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/DataComponentState.java
branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/RepeatState.java
branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java
Log:
fix project build
Modified: branches/version_1_0_7/src/cdk/META-INF/templates/facelets.taglib.vm
===================================================================
--- branches/version_1_0_7/src/cdk/META-INF/templates/facelets.taglib.vm 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/cdk/META-INF/templates/facelets.taglib.vm 2007-05-07 19:58:03 UTC (rev 181)
@@ -1,4 +1,5 @@
-/**
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
* License Agreement.
*
* Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF)
@@ -17,9 +18,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-<?xml version="1.0" encoding="UTF-8"?>
+ * -->
<!DOCTYPE facelet-taglib PUBLIC
"-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
"http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
Modified: branches/version_1_0_7/src/cdk/META-INF/templates/faces-config.vm
===================================================================
--- branches/version_1_0_7/src/cdk/META-INF/templates/faces-config.vm 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/cdk/META-INF/templates/faces-config.vm 2007-05-07 19:58:03 UTC (rev 181)
@@ -1,4 +1,7 @@
-/**
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<!--
* License Agreement.
*
* Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF)
@@ -17,11 +20,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+ * -->
<faces-config>
${facesConfig.includeContent}
Modified: branches/version_1_0_7/src/cdk/META-INF/templates/taglib.vm
===================================================================
--- branches/version_1_0_7/src/cdk/META-INF/templates/taglib.vm 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/cdk/META-INF/templates/taglib.vm 2007-05-07 19:58:03 UTC (rev 181)
@@ -1,4 +1,7 @@
-/**
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<!--
* License Agreement.
*
* Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF)
@@ -17,11 +20,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+ * -->
<taglib>
<tlib-version>${taglib.tlibversion}</tlib-version>
<jsp-version>${taglib.jspversion}</jsp-version>
Modified: branches/version_1_0_7/src/framework/generate/ajax.xml
===================================================================
--- branches/version_1_0_7/src/framework/generate/ajax.xml 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/framework/generate/ajax.xml 2007-05-07 19:58:03 UTC (rev 181)
@@ -335,7 +335,7 @@
<name>submitted</name>
<classname>boolean</classname>
</property>
- <property disabled="true">
+ <property hidden="true">
<name>requestDelay</name>
<classname>int</classname>
</property>
Modified: branches/version_1_0_7/src/framework/generate/build.xml
===================================================================
--- branches/version_1_0_7/src/framework/generate/build.xml 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/framework/generate/build.xml 2007-05-07 19:58:03 UTC (rev 181)
@@ -23,6 +23,12 @@
<pathelement path="${cdk.build.dir}"/>
</path>
+ <path id="xslt.classpath">
+ <fileset dir="${commonLibs.dir}">
+ <include name="*.jar"/>
+ <exclude name="xerces*"/>
+ </fileset>
+ </path>
<fileset dir="${framework.src.dir}" id="renderers.templates" >
<include name="**/*.jspx"/>
@@ -81,7 +87,8 @@
out="${generated-source.dir}/META-INF/faces-config.xml"
destdir="${generated-source.dir}"
in="${framework.src.dir}/java/META-INF/original-faces-config.xml" processor="trax" force="true">
- <param name="faces-config-files" expression="${generated-source.dir}/META-INF/generated-faces-config.xml,${framework.src.dir}/java/META-INF/original-faces-config.xml"/>
+ <param name="faces-config" expression="${generated-source.dir}/META-INF/generated-faces-config.xml"/>
+ <param name="original-faces-config" expression="${framework.src.dir}/java/META-INF/original-faces-config.xml"/>
<xmlcatalog>
<dtd publicid="-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
location="${framework.src.dir}/generate/xmlcatalog/web-facesconfig_1_0.dtd"
@@ -90,7 +97,7 @@
location="${framework.src.dir}/generate/xmlcatalog/web-facesconfig_1_1.dtd"
/>
</xmlcatalog>
- <classpath refid="generate.classpath">
+ <classpath refid="xslt.classpath">
</classpath>
</xslt>
</target>
Modified: branches/version_1_0_7/src/framework/generate/merge.xsl
===================================================================
--- branches/version_1_0_7/src/framework/generate/merge.xsl 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/framework/generate/merge.xsl 2007-05-07 19:58:03 UTC (rev 181)
@@ -7,14 +7,16 @@
omit-xml-declaration="no"
doctype-public="-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
doctype-system="http://java.sun.com/dtd/web-facesconfig_1_1.dtd"/>
- <xsl:param name="faces-config-files" />
+ <xsl:param name="faces-config" />
+ <xsl:param name="original-faces-config" />
<xsl:template match="/">
<faces-config xmlns="http://java.sun.com/JSF/Configuration">
- <xsl:for-each select="tokenize($faces-config-files, ',')">
- <xsl:for-each select="document(.)/*">
+ <xsl:for-each select="document($original-faces-config)/*">
<xsl:copy-of select="./*"/>
</xsl:for-each>
- </xsl:for-each>
+ <xsl:for-each select="document($faces-config)/*">
+ <xsl:copy-of select="./*"/>
+ </xsl:for-each>
</faces-config>
</xsl:template>
</xsl:stylesheet>
\ No newline at end of file
Modified: branches/version_1_0_7/src/framework/generate/templates/facelets.taglib.vm
===================================================================
--- branches/version_1_0_7/src/framework/generate/templates/facelets.taglib.vm 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/framework/generate/templates/facelets.taglib.vm 2007-05-07 19:58:03 UTC (rev 181)
@@ -1,4 +1,5 @@
-/**
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
* License Agreement.
*
* Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF)
@@ -17,9 +18,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-<?xml version="1.0" encoding="UTF-8"?>
+ * -->
<!DOCTYPE facelet-taglib PUBLIC
"-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
"http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
Modified: branches/version_1_0_7/src/framework/generate/templates/faces-config.vm
===================================================================
--- branches/version_1_0_7/src/framework/generate/templates/faces-config.vm 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/framework/generate/templates/faces-config.vm 2007-05-07 19:58:03 UTC (rev 181)
@@ -1,4 +1,8 @@
-/**
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<!--
* License Agreement.
*
* Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF)
@@ -17,14 +21,9 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
+ * -->
-<?xml version="1.0"?>
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
<faces-config>
#if(${facesConfig.include})
#include( ${facesConfig.include} )
Modified: branches/version_1_0_7/src/framework/generate/templates/taglib.vm
===================================================================
--- branches/version_1_0_7/src/framework/generate/templates/taglib.vm 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/framework/generate/templates/taglib.vm 2007-05-07 19:58:03 UTC (rev 181)
@@ -1,4 +1,5 @@
-/**
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
* License Agreement.
*
* Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF)
@@ -17,9 +18,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-<?xml version="1.0" encoding="UTF-8"?>
+ * -->
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
<taglib>
Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/DataComponentState.java
===================================================================
--- branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/DataComponentState.java 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/DataComponentState.java 2007-05-07 19:58:03 UTC (rev 181)
@@ -21,7 +21,6 @@
package org.ajax4jsf.ajax.repeat;
-import javax.faces.component.StateHolder;
/**
* Interface for classes keeped current iterable component state, as :
Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/RepeatState.java
===================================================================
--- branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/RepeatState.java 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/RepeatState.java 2007-05-07 19:58:03 UTC (rev 181)
@@ -23,8 +23,6 @@
import java.io.Serializable;
-import javax.faces.context.FacesContext;
-
/**
* @author shura
*
Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java
===================================================================
--- branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java 2007-05-07 17:59:31 UTC (rev 180)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java 2007-05-07 19:58:03 UTC (rev 181)
@@ -50,8 +50,6 @@
import org.ajax4jsf.framework.ajax.AjaxEvent;
import org.ajax4jsf.framework.renderer.AjaxChildrenRenderer;
-import com.sun.org.apache.bcel.internal.generic.GETSTATIC;
-
/**
* Base class for iterable components, like dataTable, Tomahawk dataList,
* Facelets repeat, tree etc., with support for partial rendering on AJAX
More information about the ajax4jsf-svn-commits
mailing list