August 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r18611 - in trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo: mediaOutput and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2010-08-13 06:24:21 -0400 (Fri, 13 Aug 2010) New Revision: 18611 Removed: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/view/ Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/poll/PollBean.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/region/RegionBean.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/SlidesBean.java Log: https://jira.jboss.org/browse/RF-9030 Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java 2010-08-13 06:16:59 UTC (rev 18610) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java 2010-08-13 10:24:21 UTC (rev 18611) @@ -23,7 +23,6 @@ setText("RichFaces 4.0"); setColor(1000); setScale(2); - System.out.println("MediaData instantiated"); } public Integer getColor() { Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/poll/PollBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/poll/PollBean.java 2010-08-13 06:16:59 UTC (rev 18610) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/poll/PollBean.java 2010-08-13 10:24:21 UTC (rev 18611) @@ -15,11 +15,9 @@ */ @ManagedBean @ViewScoped -public class PollBean implements Serializable{ +public class PollBean implements Serializable { - /** - * - */ + private static final int POLL_DISABLEMENT_INTERVAL = 60000; private static final long serialVersionUID = 7871292328251171957L; private Date pollStartTime; private boolean pollEnabled; @@ -34,7 +32,7 @@ pollStartTime = new Date(); return date; } - if ((date.getTime() - pollStartTime.getTime()) >= 60000) { + if ((date.getTime() - pollStartTime.getTime()) >= POLL_DISABLEMENT_INTERVAL) { setPollEnabled(false); } return date; Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/region/RegionBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/region/RegionBean.java 2010-08-13 06:16:59 UTC (rev 18610) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/region/RegionBean.java 2010-08-13 10:24:21 UTC (rev 18611) @@ -3,12 +3,12 @@ import java.io.Serializable; import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; +import javax.faces.bean.RequestScoped; import org.richfaces.demo.common.UserBean; @ManagedBean -@ViewScoped +@RequestScoped public class RegionBean implements Serializable { /** Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/SlidesBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/SlidesBean.java 2010-08-13 06:16:59 UTC (rev 18610) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/SlidesBean.java 2010-08-13 10:24:21 UTC (rev 18611) @@ -17,16 +17,12 @@ @ViewScoped public class SlidesBean implements Serializable{ - /** - * - */ private static final long serialVersionUID = -6498592143189891265L; private static final String FILE_EXT = ".jpg"; private static final int FILES_COUNT = 9; private static final String PATH_PREFIX = "/images/nature/"; private static final String PIC_NAME = "pic"; private List<Picture> pictures; - private int currentIndex = 1; public SlidesBean() { pictures = new ArrayList<Picture>(); @@ -35,14 +31,6 @@ } } - public int getCurrentIndex() { - return currentIndex; - } - - public void setCurrentIndex(int currentIndex) { - this.currentIndex = currentIndex; - } - public List<Picture> getPictures() { return pictures; }

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18610 - branches/development/docs/Component_Reference/src/main/docbook/en-US.

by richfaces-svn-commits＠lists.jboss.org

Author: SeanRogers Date: 2010-08-13 02:16:59 -0400 (Fri, 13 Aug 2010) New Revision: 18610 Modified: branches/development/docs/Component_Reference/src/main/docbook/en-US/Component_Reference.xml branches/development/docs/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml Log: Reorganised Panels chapter Modified: branches/development/docs/Component_Reference/src/main/docbook/en-US/Component_Reference.xml =================================================================== --- branches/development/docs/Component_Reference/src/main/docbook/en-US/Component_Reference.xml 2010-08-13 04:40:21 UTC (rev 18609) +++ branches/development/docs/Component_Reference/src/main/docbook/en-US/Component_Reference.xml 2010-08-13 06:16:59 UTC (rev 18610) @@ -27,8 +27,9 @@ <xi:include href="chap-Component_Reference-Menus_and_toolbars.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="chap-Component_Reference-Output_and_messages.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="chap-Component_Reference-Drag_and_drop.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + --> <xi:include href="chap-Component_Reference-Layout_and_appearance.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - --><xi:include href="chap-Component_Reference-Functions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="chap-Component_Reference-Functions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />  Modified: branches/development/docs/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml =================================================================== --- branches/development/docs/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml 2010-08-13 04:40:21 UTC (rev 18609) +++ branches/development/docs/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml 2010-08-13 06:16:59 UTC (rev 18610) @@ -119,33 +119,6 @@ <section id="sect-Component_Reference-Panels_and_containers-richtabPanel"> <title><sgmltag><rich:tabPanel></sgmltag></title> - <itemizedlist> - <listitem> - <para> - <parameter>component-type</parameter>: <classname>org.richfaces.tabPanel</classname> - </para> - </listitem> - <listitem> - <para> - <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmltabPanel</classname> - </para> - </listitem> - <listitem> - <para> - <parameter>component-family</parameter>: <classname>org.richfaces.tabPanel</classname> - </para> - </listitem> - <listitem> - <para> - <parameter>renderer-type</parameter>: <classname>org.richfaces.tabPanelRenderer</classname> - </para> - </listitem> - <listitem> - <para> - <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.tabPanelTag</classname> - </para> - </listitem> - </itemizedlist> <para> The <sgmltag><rich:tabPanel></sgmltag> component provides a set of tabbed panels for displaying one panel of content at a time. The tabs can be highly customized and themed. </para> @@ -155,32 +128,70 @@ All <sgmltag><rich:tabPanel></sgmltag> components should be wrapped in a form element so that content is correctly submitted. </para> </note> - <para> - The switching mode for performing submissions is determined by the <code>switchType</code> attribute, which can have one of the following three values: - </para> - <itemizedlist> - <listitem> - <para> - <literal>server</literal>, the default setting, which causes the <sgmltag><rich:tabPanel></sgmltag> component to perform a common submission, completely re-rendering the page. Only one panel at a time is uploaded to the client side. - </para> - </listitem> - <listitem> - <para> - <literal>ajax</literal>, which causes the <sgmltag><rich:tabPanel></sgmltag> component to perform an Ajax form submission, and the content of the panel is rendered. Only one panel at a time is uploaded to the client side. - </para> - </listitem> - <listitem> - <para> - <literal>client</literal>, which causes <sgmltag><rich:tabPanel></sgmltag> components to update on the client side, re-rendering themselves and any additional components listed with the <code>render</code> attribute. - </para> - </listitem> - </itemizedlist> - <para> - The <code>selectedTab</code> attribute holds the active tab name. - </para> - <para> - The tabs themselves can be aligned using the <code>headerAlignment</code> attribute. The attribute can be set to <code>left</code>, <code>center</code>, or <code>right</code>, aligning the header tabs to the left, center, or right of the top edge of the panel respectively. If no alignment is specified, left-alignment is the default behavior. - </para> + <section id="sect-Component_Reference-richtabPanel-Basic_usage"> + <title>Basic usage</title> + <para> + The switching mode for performing submissions is determined by the <code>switchType</code> attribute, which can have one of the following three values: + </para> + <itemizedlist> + <listitem> + <para> + <literal>server</literal>, the default setting, which causes the <sgmltag><rich:tabPanel></sgmltag> component to perform a common submission, completely re-rendering the page. Only one panel at a time is uploaded to the client side. + </para> + </listitem> + <listitem> + <para> + <literal>ajax</literal>, which causes the <sgmltag><rich:tabPanel></sgmltag> component to perform an Ajax form submission, and the content of the panel is rendered. Only one panel at a time is uploaded to the client side. + </para> + </listitem> + <listitem> + <para> + <literal>client</literal>, which causes <sgmltag><rich:tabPanel></sgmltag> components to update on the client side, re-rendering themselves and any additional components listed with the <code>render</code> attribute. + </para> + </listitem> + </itemizedlist> + <para> + The <code>selectedTab</code> attribute holds the active tab name. + </para> + </section> + + <section id="sect-Component_Reference-richtabPanel-Tab_alignment"> + <title>Tab alignment</title> + <para> + The tabs themselves can be aligned using the <code>headerAlignment</code> attribute. The attribute can be set to <code>left</code>, <code>center</code>, or <code>right</code>, aligning the header tabs to the left, center, or right of the top edge of the panel respectively. If no alignment is specified, left-alignment is the default behavior. + </para> + </section> + + <section id="sect-Component_Reference-richtabPanel-Reference_data"> + <title>Reference data</title> + <itemizedlist> + <listitem> + <para> + <parameter>component-type</parameter>: <classname>org.richfaces.tabPanel</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmltabPanel</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>component-family</parameter>: <classname>org.richfaces.tabPanel</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>renderer-type</parameter>: <classname>org.richfaces.tabPanelRenderer</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.tabPanelTag</classname> + </para> + </listitem> + </itemizedlist> + </section> </section>  @@ -207,60 +218,65 @@ <section id="sect-Component_Reference-Panels_and_containers-richtogglePanel"> <title><sgmltag><rich:togglePanel></sgmltag></title> - <itemizedlist> - <listitem> - <para> - <parameter>component-type</parameter>: <classname>org.richfaces.TogglePanel</classname> - </para> - </listitem> - <listitem> - <para> - <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlTogglePanel</classname> - </para> - </listitem> - <listitem> - <para> - <parameter>component-family</parameter>: <classname>org.richfaces.TogglePanel</classname> - </para> - </listitem> - <listitem> - <para> - <parameter>renderer-type</parameter>: <classname>org.richfaces.TogglePanelRenderer</classname> - </para> - </listitem> - <listitem> - <para> - <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.TogglePanelTag</classname> - </para> - </listitem> - </itemizedlist> <para> The <sgmltag><rich:togglePanel></sgmltag> component is a wrapper component with named facets. Each facet is displayed after activating a corresponding <sgmltag><rich:toggleControl></sgmltag> component. </para> - <para> - The initial state of the component can be configured using the <code>initialState</code> attribute, which points to a facet name to display. Alternatively, setting <code>initialState="empty"</code>, the initial state will be blank until the user selects an option. - </para> - <para> - The order in which the facets are shown can be defined using the <code>statusOrder</code> attribute, listing the facet names separated by commas, as shown in <xref linkend="exam-Component_Reference-richtogglePanel-State_order_example" />. - </para> - <example id="exam-Component_Reference-richtogglePanel-State_order_example"> - <title>State order example</title> - -<programlisting language="XML" role="XML"> -<rich:togglePanel id="panel" initialState="panelB" switchType="client" stateOrder="panelA,panelB,panelC"> - <f:facet name="panelA"> - ... - </f:facet> - <f:facet name="panelB"> - ... - </f:facet> - <f:facet name="panelC"> - ... - </f:facet> -</rich:togglePanel> -<rich:toggleControl for="panel" value="Switch"/> -</programlisting> - </example> + + <section id="sect-Component_Reference-richtogglePanel-Basic_usage"> + <title>Basic usage</title> + <para> + The initial state of the component can be configured using the <code>initialState</code> attribute, which points to a facet name to display. Alternatively, setting <code>initialState="empty"</code>, the initial state will be blank until the user selects an option. + </para> + <para> + The order in which the facets are shown can be defined using the <code>statusOrder</code> attribute, listing the facet names separated by commas, as shown in <xref linkend="exam-Component_Reference-richtogglePanel-State_order_example" />. + </para> + <example id="exam-Component_Reference-richtogglePanel-State_order_example"> + <title>State order example</title> + <programlisting language="XML" role="XML"><rich:togglePanel id="panel" initialState="panelB" switchType="client" stateOrder="panelA,panelB,panelC"> + <f:facet name="panelA"> + ... + </f:facet> + <f:facet name="panelB"> + ... + </f:facet> + <f:facet name="panelC"> + ... + </f:facet> + </rich:togglePanel> + <rich:toggleControl for="panel" value="Switch"/></programlisting> + </example> + </section> + + <section id="sect-Component_Reference-richtogglePanel-Reference_data"> + <title>Reference data</title> + <itemizedlist> + <listitem> + <para> + <parameter>component-type</parameter>: <classname>org.richfaces.TogglePanel</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlTogglePanel</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>component-family</parameter>: <classname>org.richfaces.TogglePanel</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>renderer-type</parameter>: <classname>org.richfaces.TogglePanelRenderer</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.TogglePanelTag</classname> + </para> + </listitem> + </itemizedlist> + </section> </section>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18609 - branches/development/docs/Component_Reference/src/main/docbook/en-US.

by richfaces-svn-commits＠lists.jboss.org

Author: SeanRogers Date: 2010-08-13 00:40:21 -0400 (Fri, 13 Aug 2010) New Revision: 18609 Modified: branches/development/docs/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Layout_and_appearance.xml Log: Fixed invalid selector information RF-8655 Modified: branches/development/docs/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Layout_and_appearance.xml =================================================================== --- branches/development/docs/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Layout_and_appearance.xml 2010-08-12 23:45:02 UTC (rev 18608) +++ branches/development/docs/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Layout_and_appearance.xml 2010-08-13 04:40:21 UTC (rev 18609) @@ -90,7 +90,7 @@ <title>Example selector values</title> <variablelist> <varlistentry> - <term><code>p[a]</code></term> + <term><code>p:has(a)</code></term> <listitem> <para> All <sgmltag><p></sgmltag> elements which contain an <sgmltag><a></sgmltag> element are selected. @@ -98,7 +98,7 @@ </listitem> </varlistentry> <varlistentry> - <term><code>p.foo[a]</code></term> + <term><code>p.foo:has(a)</code></term> <listitem> <para> All <sgmltag><p></sgmltag> elements of class <literal>foo</literal> which contain an <sgmltag><a></sgmltag> element are selected. @@ -114,15 +114,15 @@ </listitem> </varlistentry> <varlistentry> - <term><code>ul/li</code></term> + <term><code>ul > li</code></term> <listitem> <para> - All <sgmltag><li></sgmltag> elements contained in <sgmltag><ul></sgmltag> elements are selected. + All <sgmltag><li></sgmltag> elements that are children of <sgmltag><ul></sgmltag> elements are selected. </para> </listitem> </varlistentry> <varlistentry> - <term><code>input[@name=bar]</code></term> + <term><code>input[name=bar]</code></term> <listitem> <para> All <sgmltag><input></sgmltag> elements with a <varname>name</varname> attribute whose value is <literal>bar</literal> are selected. @@ -130,10 +130,10 @@ </listitem> </varlistentry> <varlistentry> - <term><code>input[@type=radio][@checked]</code></term> + <term><code>input[type=radio][@checked]</code></term> <listitem> <para> - All <sgmltag><input></sgmltag> elements with both a <code><varname>type</varname>="radio"</code> attribute and a <code><varname>checked</varname></code> attribute are selected. + All <sgmltag><input></sgmltag> elements with both a <code><varname>type</varname>="radio"</code> attribute and a <varname>checked</varname> attribute are selected. </para> </listitem> </varlistentry> @@ -149,10 +149,11 @@ <term><code>p span</code></term> <listitem> <para> - All <sgmltag><span></sgmltag> elements that are direct or indirect children of <sgmltag><p></sgmltag> elements are selected. + All <sgmltag><span></sgmltag> elements that are direct or indirect children of <sgmltag><p></sgmltag> elements are selected. Use <code>p > span</code> for direct children only. </para> </listitem> </varlistentry> +  <varlistentry> - <term><code>p[@foo^=bar]</code></term> + <term><code>p[foo^=bar]</code></term> <listitem> <para> All <sgmltag><p></sgmltag> elements that contain a <varname>foo</varname> attribute with a textual value <emphasis>beginning</emphasis> with <literal>bar</literal> are selected. @@ -178,7 +180,7 @@ </listitem> </varlistentry> <varlistentry> - <term><code>p[@foo$=bar]</code></term> + <term><code>p[foo$=bar]</code></term> <listitem> <para> All <sgmltag><p></sgmltag> elements that contain a <varname>foo</varname> attribute with a textual value <emphasis>ending</emphasis> with <literal>bar</literal> are selected. @@ -186,7 +188,7 @@ </listitem> </varlistentry> <varlistentry> - <term><code>p[@foo*=bar]</code></term> + <term><code>p[foo*=bar]</code></term> <listitem> <para> All <sgmltag><p></sgmltag> elements that contain a <varname>foo</varname> attribute with a textual value that contains the sub-string <literal>bar</literal> in any position are selected.

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18608 - in branches/cdk-8570/cdk: parent and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-08-12 19:45:02 -0400 (Thu, 12 Aug 2010) New Revision: 18608 Modified: branches/cdk-8570/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml branches/cdk-8570/cdk/parent/pom.xml Log: Modified: branches/cdk-8570/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml =================================================================== --- branches/cdk-8570/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2010-08-12 23:43:13 UTC (rev 18607) +++ branches/cdk-8570/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2010-08-12 23:45:02 UTC (rev 18608) @@ -8,8 +8,6 @@ <cdk:superclass>javax.faces.render.Renderer</cdk:superclass> <cdk:component-family>org.richfaces.cdk.test.Test </cdk:component-family> - <cdk:component-type>org.richfaces.cdk.test.TestComponent - </cdk:component-type> <cdk:renderer-type>org.richfaces.TestRenderer</cdk:renderer-type> <cdk:renderkit-id>RF4_XHTML</cdk:renderkit-id> <cdk:renders-children>false</cdk:renders-children> Modified: branches/cdk-8570/cdk/parent/pom.xml =================================================================== --- branches/cdk-8570/cdk/parent/pom.xml 2010-08-12 23:43:13 UTC (rev 18607) +++ branches/cdk-8570/cdk/parent/pom.xml 2010-08-12 23:45:02 UTC (rev 18608) @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> - </parent> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>9</version> + </parent> <modelVersion>4.0.0</modelVersion> @@ -19,7 +20,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <richfaces.checkstyle.version>1</richfaces.checkstyle.version> + <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/cdk/parent</connection> @@ -153,227 +154,230 @@ </plugins> </pluginManagement> </build> - <dependencyManagement> - <dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <version>${jsf2.api.version}</version> + </dependency> -  - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.jboss.el</groupId> - <artifactId>jboss-el</artifactId> - <version>1.0_02.CR4</version> - </dependency> -  - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>com.sun.xsom</groupId> - <artifactId>xsom</artifactId> - <version>20081112</version> - </dependency> - <dependency> - <groupId>com.googlecode.functional-collections</groupId> - <artifactId>functional-collections</artifactId> - <version>1.1.7</version> - <exclusions> - <exclusion> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>r05</version> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-grapher</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-assisted-inject</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-guice</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.9</version> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + <version>1.0_02.CR4</version> + </dependency> +  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>com.sun.xsom</groupId> + <artifactId>xsom</artifactId> + <version>20081112</version> + </dependency> + <dependency> + <groupId>com.googlecode.functional-collections</groupId> + <artifactId>functional-collections</artifactId> + <version>1.1.7</version> + <exclusions> + <exclusion> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r05</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-grapher</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-assisted-inject</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-guice</artifactId> + <version>2.2.0</version> + </dependency> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.9</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + </dependency> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <scope>test</scope> - <version>1.3</version> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.5.2</version> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - <version>2.0.9</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>2.0.9</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>2.0.10</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.0.10</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.10</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-archiver</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>file-management</artifactId> - <version>1.2.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>com.google.code.javaparser</groupId> - <artifactId>javaparser</artifactId> - <version>1.0.1</version> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>commons</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>commons</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>attributes</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>xinclude</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>generator</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <scope>test</scope> + <version>1.3</version> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.5.2</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>2.0.9</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>2.0.9</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>2.0.10</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0.10</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.10</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-archiver</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>file-management</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.5.15</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>com.google.code.javaparser</groupId> + <artifactId>javaparser</artifactId> + <version>1.0.1</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>commons</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>attributes</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>xinclude</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>generator</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> <reporting> <plugins> <plugin>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18607 - in branches/cdk-8570/cdk/generator/src/main: resources/META-INF/templates and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-08-12 19:43:13 -0400 (Thu, 12 Aug 2010) New Revision: 18607 Modified: branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java branches/cdk-8570/cdk/generator/src/main/resources/META-INF/templates/taghandler.ftl Log: complete - task : Optimise generated TagHandler imports Modified: branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java =================================================================== --- branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java 2010-08-12 22:55:41 UTC (rev 18606) +++ branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java 2010-08-12 23:43:13 UTC (rev 18607) @@ -32,6 +32,7 @@ import org.richfaces.cdk.model.ConverterModel; import org.richfaces.cdk.model.EventModel; import org.richfaces.cdk.model.EventName; +import org.richfaces.cdk.model.MethodSignature; import org.richfaces.cdk.model.ModelElementBase; import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.model.ValidatorModel; @@ -110,6 +111,10 @@ return getImportClasses(); } else if ("implemented".equals(key)) { return getImplementedInterfaces(); + } else if ("tagImports".equals(key)) { + return getTagImports(); + } else if ("hasBindingAttribute".equals(key)) { + return hasBindingAttribute(); } return super.get(key); @@ -136,6 +141,36 @@ return this.wrapper.wrap(result); } + public TemplateModel getTagImports() throws TemplateModelException { + Set<ClassName> result = Sets.newTreeSet(); + + for (PropertyBase entry : model.getAttributes()) { + if (!(entry.isHidden()||entry.isReadOnly()||null == entry.getSignature())) { + MethodSignature methodSignature = entry.getSignature(); + if(!isPredefined(methodSignature.getReturnType())){ + result.add(methodSignature.getReturnType()); + } + for (ClassName className : methodSignature.getParameters()) { + if(!isPredefined(className)){ + result.add(className); + } + + } + } + } + return this.wrapper.wrap(result); + } + + public TemplateModel hasBindingAttribute() throws TemplateModelException { + return wrapper.wrap(Iterables.any(model.getAttributes(), new Predicate<PropertyBase>() { + + @Override + public boolean apply(PropertyBase input) { + return input.isBindingAttribute(); + } + })); + } + public TemplateModel getImplementedInterfaces() throws TemplateModelException { Set<ClassName> result = Sets.newTreeSet(); if(getEventNames().size()>0){ @@ -154,11 +189,11 @@ } public boolean isPredefined(PropertyBase property) { - return property.isPrimitive() || isFromJavaLang(property.getType()); + return isPredefined(property.getType()); } - public boolean isFromJavaLang(ClassName type) { - return "java.lang".equals(type.getPackage()); + public boolean isPredefined(ClassName type) { + return type.isPrimitive() ||"java.lang".equals(type.getPackage()); } private TemplateModel eventNames() throws TemplateModelException { Modified: branches/cdk-8570/cdk/generator/src/main/resources/META-INF/templates/taghandler.ftl =================================================================== --- branches/cdk-8570/cdk/generator/src/main/resources/META-INF/templates/taghandler.ftl 2010-08-12 22:55:41 UTC (rev 18606) +++ branches/cdk-8570/cdk/generator/src/main/resources/META-INF/templates/taghandler.ftl 2010-08-12 23:43:13 UTC (rev 18607) @@ -3,6 +3,7 @@ package ${tag.targetClass.package}; import java.io.Serializable; +<#if model.hasBindingAttribute=true> import javax.el.MethodExpression; import javax.el.ELException; import javax.el.MethodExpression; @@ -15,13 +16,14 @@ import javax.faces.view.facelets.MetaRuleset; import javax.faces.view.facelets.Metadata; import javax.faces.view.facelets.MetadataTarget; +import javax.faces.view.facelets.TagAttribute; +</#if> import javax.faces.view.facelets.${model}Config; -import javax.faces.view.facelets.TagAttribute; import ${model.targetClass}; import ${tag.baseClass}; -<#assign useMetaRule=false /> -<#list model.tagAttributes as prop><#if prop.signature?exists><#list prop.signature.parameters as class>import ${class.name}; -</#list></#if><#if (prop.binding || prop.bindingAttribute)><#assign useMetaRule=true /></#if></#list> +<#list model.tagImports as importedClass>import ${importedClass.name}; +</#list> + public class ${tag.targetClass.simpleName} extends ${tag.baseClass.simpleName} { @@ -32,7 +34,7 @@ } -<#if useMetaRule=true> +<#if model.hasBindingAttribute=true> <#assign useMethodBinding=false /> private static final MetaRule META_RULE = new MetaRule(){

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18606 - in branches/cdk-8570/cdk/generator: src/main/java/org/richfaces/cdk/apt/processors and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-08-12 18:55:41 -0400 (Thu, 12 Aug 2010) New Revision: 18606 Modified: branches/cdk-8570/cdk/generator/.checkstyle branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java Log: CODING IN PROGRESS - issue RF-8909: CDK: renderer-type is not written into .taglib.xml https://jira.jboss.org/browse/RF-8909 Modified: branches/cdk-8570/cdk/generator/.checkstyle =================================================================== --- branches/cdk-8570/cdk/generator/.checkstyle 2010-08-12 22:43:03 UTC (rev 18605) +++ branches/cdk-8570/cdk/generator/.checkstyle 2010-08-12 22:55:41 UTC (rev 18606) @@ -3,7 +3,7 @@ <fileset name="JavaSource" enabled="true" check-config-name="RichFaces" local="false"> <file-match-pattern match-pattern="src/main/java" include-pattern="true"/> </fileset> - <fileset name="test sources" enabled="true" check-config-name="RichFaces" local="false"> + <fileset name="test sources" enabled="false" check-config-name="RichFaces" local="false"> <file-match-pattern match-pattern="src/test/java" include-pattern="true"/> </fileset> <filter name="NonSrcDirs" enabled="true"/> Modified: branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java =================================================================== --- branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-08-12 22:43:03 UTC (rev 18605) +++ branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-08-12 22:55:41 UTC (rev 18606) @@ -130,7 +130,7 @@ component.setRendererType(FacesId.parseId(jsfRenderer.type())); } if(!Strings.isEmpty(jsfRenderer.template())){ - + // TODO - store template path in model. } } Modified: branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java =================================================================== --- branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-08-12 22:43:03 UTC (rev 18605) +++ branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-08-12 22:55:41 UTC (rev 18606) @@ -221,7 +221,7 @@ @Override public FacesId inferType() throws CallbackException { - throw new CallbackException("Cannot determine renderer type"); + throw new CallbackException("Cannot determine renderer type"); } @Override

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18605 - in branches/RF-9040_build_updated_m2: ui/common/api and 8 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2010-08-12 18:43:03 -0400 (Thu, 12 Aug 2010) New Revision: 18605 Modified: branches/RF-9040_build_updated_m2/bom/pom.xml branches/RF-9040_build_updated_m2/ui/common/api/pom.xml branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml branches/RF-9040_build_updated_m2/ui/output/api/pom.xml branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml branches/RF-9040_build_updated_m2/ui/parent/pom.xml Log: RF-9040, RF9042 cleanup and updates because of refactor Modified: branches/RF-9040_build_updated_m2/bom/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/bom/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/bom/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -113,11 +113,6 @@ <artifactId>richfaces-components-ui</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${project.version}</version> - </dependency>  <dependency> <groupId>javax.faces</groupId> Modified: branches/RF-9040_build_updated_m2/ui/common/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/common/api/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/common/api/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -33,56 +33,4 @@ <artifactId>richfaces-ui-common-api</artifactId> <name>Richfaces UI Components: Common API</name> <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> -  - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </project> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -43,62 +43,6 @@ <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-api</artifactId> </dependency> - -  - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> -  - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -30,85 +30,11 @@ <name>Richfaces UI Components: Core UI</name> <packaging>jar</packaging> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - </plugin> - </plugins> - </build> <dependencies> -  <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> -  - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency> - - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> -  - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -35,28 +35,7 @@ <packaging>jar</packaging> <dependencies> -  <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> </dependency> @@ -64,34 +43,6 @@ <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-api</artifactId> </dependency> - -  - <dependency> -  - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -35,101 +35,16 @@ <name>Richfaces UI Components: Iteration UI</name> <packaging>jar</packaging> - <properties> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <configuration> - <fail>false</fail> - </configuration> - </plugin> - </plugins> - </build> - <dependencies>  <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency> <dependency> -  - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-api</artifactId> </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> -  - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -59,75 +59,20 @@ </properties> <dependencies> -  <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency> <dependency> <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> - </dependency> - -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> -  - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> + </dependency> </dependencies> <profiles> <profile> <id>release</id> - +  <build> <plugins> <plugin> Modified: branches/RF-9040_build_updated_m2/ui/output/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/output/api/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/output/api/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -38,63 +38,9 @@ <dependencies>  <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-api</artifactId> </dependency> - -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> -  - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -44,17 +44,7 @@ </build> <dependencies> -  <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> -  - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency> @@ -64,65 +54,9 @@ <artifactId>richfaces-ui-core-ui</artifactId> </dependency> <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.richfaces.ui.output</groupId> <artifactId>richfaces-ui-output-api</artifactId> </dependency> - -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> -  - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/parent/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -1,25 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> - +  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" +> <modelVersion>4.0.0</modelVersion> @@ -38,7 +39,7 @@ <properties> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> - + <build> <pluginManagement> <plugins> @@ -62,8 +63,10 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> <version>${project.version}</version> -  +  <configuration> <library> <prefix>org.richfaces</prefix> @@ -127,6 +130,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> + <version>${project.version}</version> <scope>provided</scope> </dependency>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18604 - in branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk: model and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-08-12 18:37:47 -0400 (Thu, 12 Aug 2010) New Revision: 18604 Modified: branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/NamingConventionsCallback.java branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java Log: CODING IN PROGRESS - issue RF-8909: CDK: renderer-type is not written into .taglib.xml https://jira.jboss.org/browse/RF-8909 Modified: branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java =================================================================== --- branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-08-12 22:24:42 UTC (rev 18603) +++ branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-08-12 22:37:47 UTC (rev 18604) @@ -126,7 +126,12 @@ } private void setRendererType(ComponentModel component, JsfRenderer jsfRenderer) { - component.setRendererType(FacesId.parseId(jsfRenderer.type())); + if(!Strings.isEmpty(jsfRenderer.type())){ + component.setRendererType(FacesId.parseId(jsfRenderer.type())); + } + if(!Strings.isEmpty(jsfRenderer.template())){ + + } } private void processAttributes(TypeElement componentElement, ComponentModel component, JsfComponent annotation) { Modified: branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java =================================================================== --- branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java 2010-08-12 22:24:42 UTC (rev 18603) +++ branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java 2010-08-12 22:37:47 UTC (rev 18604) @@ -34,6 +34,7 @@ import javax.lang.model.type.TypeMirror; import org.richfaces.cdk.FileManager; +import org.richfaces.cdk.Logger; import org.richfaces.cdk.Source; import org.richfaces.cdk.Sources; import org.richfaces.cdk.annotations.JsfComponent; @@ -57,6 +58,9 @@ private static final String COMPONENT_FAMILY = "COMPONENT_FAMILY"; private static final String RENDERER_TYPE = "RENDERER_TYPE"; + + @Inject + private Logger log; @Inject @Source(Sources.RENDERER_TEMPLATES) @@ -72,13 +76,6 @@ addToRenderKit(annotation, library, rendererModel); -/* ComponentModel componentModel = library.getComponentModel(rendererModel.getFamily()); - if (componentModel != null) { - componentModel.getRenderers().add(rendererModel); - } else { - System.out.println("For renderer with type (" + rendererModel.getType() + ") and family (" - + rendererModel.getFamily() + ") comopnent was not found"); - }*/ } public RendererModel process(TypeElement rendererElement, JsfRenderer annotation, ComponentLibrary library) { @@ -87,25 +84,15 @@ setClassNames(rendererElement, rendererModel, null); setRendererType(rendererElement, rendererModel, annotation); - setComponentType(rendererModel); setComponentFamily(rendererElement, rendererModel, annotation); setDescription(rendererModel, annotation.description(), getDocComment(rendererElement)); setTemplate(rendererModel, annotation); -// processFacets(componentElement, renderer); -// processEvents(componentElement, renderer); - // TODO - process renderers ( @JsfRenderer and @RendererTemplate attribute. // TODO - process @Test annotations. -// processAttributes(componentElement, component); return rendererModel; } - public RendererModel process(JsfRenderer renderer, ComponentLibrary library) { - RendererModel rendererModel = new RendererModel(); - return rendererModel; - } - protected void setClassNames(TypeElement componentElement, RendererModel modelElement, String generatedClass) { if (componentElement.getModifiers().contains(Modifier.ABSTRACT) || !Strings.isEmpty(generatedClass)) { @@ -125,10 +112,6 @@ } - private void setComponentType(RendererModel rendererModel) { -// getNamingConventions().inferComponentType(rendererModel.getFamily()); - } - private void addToRenderKit(JsfRenderer annotation, ComponentLibrary library, RendererModel rendererModel) { String renderKitId = annotation.renderKitId(); if (Strings.isEmpty(renderKitId)) { @@ -141,21 +124,18 @@ String template = annotation.template(); if (!Strings.isEmpty(template)) { rendererModel.setTemplatePath(template); - // TODO - add template to source list to process it in appropriate builder. - processRendererTemplate(rendererModel); + // processRendererTemplate(rendererModel); } } private void processRendererTemplate(RendererModel renderer) { String templatePath = renderer.getTemplatePath(); try { - File file = sources.getFile(templatePath); templateParser.build(file, renderer); } catch (FileNotFoundException e) { - // TODO log - e.printStackTrace(); + log.error("Template file not found", e); } } Modified: branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java =================================================================== --- branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java 2010-08-12 22:24:42 UTC (rev 18603) +++ branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java 2010-08-12 22:37:47 UTC (rev 18604) @@ -47,8 +47,6 @@ private boolean rendersChildren; - private TagModel tag; - public RendererModel() { } public RendererModel(FacesId type) { @@ -89,14 +87,6 @@ this.rendersChildren = rendersChildren; } - public TagModel getTag() { - return this.tag; - } - - public void setTag(TagModel tag) { - this.tag = tag; - } - public String getTemplatePath() { return templatePath; } Modified: branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/NamingConventionsCallback.java =================================================================== --- branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/NamingConventionsCallback.java 2010-08-12 22:24:42 UTC (rev 18603) +++ branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/NamingConventionsCallback.java 2010-08-12 22:37:47 UTC (rev 18604) @@ -37,13 +37,13 @@ * @return * @throws CallbackException */ - ClassName inferBaseClass() throws CallbackException; + ClassName getDefaultBaseClass() throws CallbackException; /** * <p class="changed_added_4_0">Infer default Java class name.</p> * @return * @throws CallbackException */ - ClassName inferClass() throws CallbackException; + ClassName getDefaultClass() throws CallbackException; } \ No newline at end of file Modified: branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java =================================================================== --- branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-08-12 22:24:42 UTC (rev 18603) +++ branches/cdk-8570/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-08-12 22:37:47 UTC (rev 18604) @@ -28,7 +28,6 @@ import java.util.NoSuchElementException; import javax.faces.component.UIComponentBase; -import javax.faces.component.behavior.ClientBehavior; import javax.faces.component.behavior.ClientBehaviorBase; import javax.faces.render.Renderer; import javax.faces.view.facelets.BehaviorHandler; @@ -116,7 +115,7 @@ String methodName = event.getListenerMethod(); if (null == methodName) { // TODO infer listener method name. - methodName="process"; + methodName = "process"; event.setListenerMethod(methodName); } ClassName sourceInterface = event.getSourceInterface(); @@ -176,7 +175,7 @@ @Override public FacesId inferType() throws CallbackException { - throw new CallbackException("Cannot infer type for behavior "+behavior); + throw new CallbackException("Cannot infer type for behavior " + behavior); } @Override @@ -185,13 +184,13 @@ } @Override - public ClassName inferBaseClass() throws CallbackException { + public ClassName getDefaultBaseClass() throws CallbackException { return ClassName.get(ClientBehaviorBase.class); } @Override - public ClassName inferClass() throws CallbackException { - throw new CallbackException("Cannot infer Java class name for behavior "+behavior); + public ClassName getDefaultClass() throws CallbackException { + throw new CallbackException("Cannot infer Java class name for behavior " + behavior); } }); for (TagModel tag : behavior.getTags()) { @@ -214,24 +213,15 @@ // Check type. verifyTypes(renderer, new NamingConventionsCallback() { - + @Override public FacesId inferType(ClassName targetClass) { return namingConventions.inferRendererType(targetClass); } - + @Override public FacesId inferType() throws CallbackException { - FacesId rendererType; - String templatePath = renderer.getTemplatePath(); - if(null != templatePath){ - rendererType = namingConventions.inferRendererTypeByTemplatePath(templatePath); - } else { - // lookup for renderer-specific component type. - String componentType = renderer.getComponentType(); - throw new CallbackException("Cannot determine renderer type"); - } - return rendererType; + throw new CallbackException("Cannot determine renderer type"); } @Override @@ -240,21 +230,26 @@ } @Override - public ClassName inferClass() throws CallbackException { + public ClassName getDefaultClass() throws CallbackException { throw new CallbackException("Cannot determine renderer class name"); } @Override - public ClassName inferBaseClass() throws CallbackException { + public ClassName getDefaultBaseClass() throws CallbackException { return ClassName.get(Renderer.class); } }); // Check component type. + for (ComponentModel component : library.getComponents()) { + if(renderer.getId().equals(component.getRendererType())){ + renderer.getAttributes().addAll(component.getAttributes()); + renderer.setFamily(component.getFamily()); + } + } // Check family. - if(null == renderer.getFamily()){ -// renderer.setFamily(namingConventions.inferRendererBaseName(renderer.getId())); + if (null == renderer.getFamily()) { + // renderer.setFamily(namingConventions.inferRendererBaseName(renderer.getId())); } - // Check attributes ( propagate descriptions from renderer-specific component ). } protected void verifyComponents(ComponentLibrary library) throws CdkException { @@ -365,12 +360,12 @@ } @Override - public ClassName inferBaseClass() throws CallbackException { + public ClassName getDefaultBaseClass() throws CallbackException { return ClassName.get(UIComponentBase.class); } @Override - public ClassName inferClass() throws CallbackException { + public ClassName getDefaultClass() throws CallbackException { throw new CallbackException("Cannot determine component class name"); } @@ -378,7 +373,7 @@ public FacesId inferType() throws CallbackException { throw new CallbackException("Cannot determine component type"); } - + }) && null == component.getFamily()) { // Check family. component.setFamily(namingConventions.inferUIComponentFamily(component.getId())); @@ -386,38 +381,44 @@ } /** - * <p class="changed_added_4_0">This method virifies type/family attributes for JSF objects ( components, renderers, validators, converters, behaviors )</p> - * @param component object to verify. - * @param callback callback to corresponding naming conventions. + * <p class="changed_added_4_0"> + * This method virifies type/family attributes for JSF objects ( components, renderers, validators, converters, + * behaviors ) + * </p> + * + * @param component + * object to verify. + * @param callback + * callback to corresponding naming conventions. * @return */ protected boolean verifyTypes(FacesComponent component, NamingConventionsCallback callback) { // Check JsfComponent type. try { - if (null == component.getId()) { - if (null != component.getTargetClass()) { - component.setId(callback.inferType(component.getTargetClass())); - } else if (null != component.getBaseClass()) { - component.setId(callback.inferType(component.getBaseClass())); - } else { - component.setId(callback.inferType()); + if (null == component.getId()) { + if (null != component.getTargetClass()) { + component.setId(callback.inferType(component.getTargetClass())); + } else if (null != component.getBaseClass()) { + component.setId(callback.inferType(component.getBaseClass())); + } else { + component.setId(callback.inferType()); + } } - } - // Check classes. - if (component.isGenerate()) { - if (null == component.getBaseClass()) { - component.setBaseClass(callback.inferBaseClass()); - // return; + // Check classes. + if (component.isGenerate()) { + if (null == component.getBaseClass()) { + component.setBaseClass(callback.getDefaultBaseClass()); + // return; + } + if (null == component.getTargetClass()) { + component.setTargetClass(callback.inferClass(component.getId())); + } } else if (null == component.getTargetClass()) { - component.setTargetClass(callback.inferClass(component.getId())); + if (null == component.getBaseClass()) { + component.setBaseClass(callback.getDefaultClass()); + } + component.setTargetClass(component.getBaseClass()); } - } else if (null == component.getTargetClass()) { - if (null == component.getBaseClass()) { - component.setBaseClass(callback.inferClass()); - } - component.setTargetClass(component.getBaseClass()); - - } } catch (CallbackException e) { log.error(e.getMessage()); return false; @@ -448,9 +449,9 @@ } else if ("javax.el.MethodExpression".equals(attribute.getType().getName())) { attribute.setBindingAttribute(true); } - //if(attribute.isBindingAttribute() && attribute.getSignature().isEmpty() && !attribute.isHidden()) { - // log.error("Signature for method expression attribute "+attribute.getName()+" has not been set"); - //} + // if(attribute.isBindingAttribute() && attribute.getSignature().isEmpty() && !attribute.isHidden()) { + // log.error("Signature for method expression attribute "+attribute.getName()+" has not been set"); + // } // Check "generate" flag. if (generatedComponent) { // TODO Attribute should be only generated if it does not exist or abstract in the base class.

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18603 - in branches/RF-9040_build_updated_m2/ui: parent and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2010-08-12 18:24:42 -0400 (Thu, 12 Aug 2010) New Revision: 18603 Modified: branches/RF-9040_build_updated_m2/ui/misc/pom.xml branches/RF-9040_build_updated_m2/ui/parent/pom.xml Log: RF-9040, RF-8944 - fixed snapshot reference in misc. Modified: branches/RF-9040_build_updated_m2/ui/misc/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/misc/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) +++ branches/RF-9040_build_updated_m2/ui/misc/pom.xml 2010-08-12 22:24:42 UTC (rev 18603) @@ -1,24 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> - +  -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" +> <modelVersion>4.0.0</modelVersion> @@ -55,24 +57,7 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - </plugin> - - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <configuration> - <fail>false</fail> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <configuration>  Modified: branches/RF-9040_build_updated_m2/ui/parent/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) +++ branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 22:24:42 UTC (rev 18603) @@ -62,6 +62,8 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> <version>${project.version}</version> +  <configuration> <library> <prefix>org.richfaces</prefix>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18602 - in branches/RF-9040_build_updated_m2: dist and 7 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2010-08-12 17:05:59 -0400 (Thu, 12 Aug 2010) New Revision: 18602 Modified: branches/RF-9040_build_updated_m2/archetypes/pom.xml branches/RF-9040_build_updated_m2/dist/pom.xml branches/RF-9040_build_updated_m2/examples/core-demo/pom.xml branches/RF-9040_build_updated_m2/examples/iteration-demo/pom.xml branches/RF-9040_build_updated_m2/examples/misc-demo/pom.xml branches/RF-9040_build_updated_m2/examples/output-demo/pom.xml branches/RF-9040_build_updated_m2/examples/pom.xml branches/RF-9040_build_updated_m2/examples/repeater-demo/pom.xml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/pom.xml Log: RF-9040 examples, archetypes, & dist updated with refactor Modified: branches/RF-9040_build_updated_m2/archetypes/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/archetypes/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) +++ branches/RF-9040_build_updated_m2/archetypes/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>6</version> + <version>9</version> </parent> <groupId>org.richfaces.archetypes</groupId> @@ -43,6 +43,7 @@ </modules> <properties> +  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> Modified: branches/RF-9040_build_updated_m2/dist/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/dist/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) +++ branches/RF-9040_build_updated_m2/dist/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) @@ -23,8 +23,8 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> + <artifactId>richfaces-bom</artifactId> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.richfaces</groupId> @@ -34,54 +34,43 @@ <name>Richfaces Distribution Assembler</name> <properties> - <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> - <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version> - <org.richfaces.ui.version>4.0.0-SNAPSHOT</org.richfaces.ui.version> - <org.richfaces.examples.core-demo.version>4.0.0-SNAPSHOT</org.richfaces.examples.core-demo.version> - <org.richfaces.examples.richfaces-showcase.version>4.0.0-SNAPSHOT</org.richfaces.examples.richfaces-showcase.version> - <org.richfaces.archetypes.richfaces-archetype-simpleapp.version>4.0.0-SNAPSHOT</org.richfaces.archetypes.richfaces-archetype-simpleapp.version> </properties> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-components-api</artifactId> - <version>${org.richfaces.ui.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-components-ui</artifactId> - <version>${org.richfaces.ui.version}</version> </dependency> <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-api</artifactId> - <version>${org.richfaces.core.version}</version> </dependency> <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-impl</artifactId> - <version>${org.richfaces.core.version}</version> </dependency> <dependency> <groupId>org.richfaces.commons</groupId> <artifactId>richfaces-commons-api</artifactId> - <version>${org.richfaces.commons.version}</version> </dependency>  <dependency> <groupId>org.richfaces.examples</groupId> <artifactId>core-demo</artifactId> - <version>${org.richfaces.examples.core-demo.version}</version> + <version>${project.version}</version> <type>war</type> <classifier>tomcat6</classifier> </dependency> <dependency> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-showcase</artifactId> - <version>${org.richfaces.examples.richfaces-showcase.version}</version> + <version>${project.version}</version> <type>war</type> <classifier>tomcat6</classifier> </dependency> @@ -90,7 +79,7 @@ <dependency> <groupId>org.richfaces.archetypes</groupId> <artifactId>richfaces-archetype-simpleapp</artifactId> - <version>${org.richfaces.archetypes.richfaces-archetype-simpleapp.version}</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: branches/RF-9040_build_updated_m2/examples/core-demo/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/examples/core-demo/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) +++ branches/RF-9040_build_updated_m2/examples/core-demo/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) @@ -1,30 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +  +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" +> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>9</version> + <version>10-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> @@ -38,23 +40,26 @@ <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - + <jetty.port>8080</jetty.port> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <org.richfaces.ui.version>4.0.0-SNAPSHOT</org.richfaces.ui.version> + <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version> </properties> <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-parent</artifactId> - <version>${org.richfaces.ui.version}</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <version>${org.richfaces.bom.version}</version> <scope>import</scope> <type>pom</type> </dependency> -  +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> @@ -71,13 +76,14 @@ </dependencyManagement> <dependencies> +  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -150,7 +156,9 @@ <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector" + > <port>${jetty.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> @@ -212,8 +220,12 @@ </goals> <phase>package</phase> <configuration> -  +  <classesDirectory>${basedir}/target/sources/sources</classesDirectory> <classifier>sources</classifier> </configuration> @@ -239,14 +251,15 @@ </build> <dependencies> +  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -270,7 +283,7 @@ </snapshots> </repository> </repositories> - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/examples/core-demo</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/examples/core-demo</developerConnection> Modified: branches/RF-9040_build_updated_m2/examples/iteration-demo/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/examples/iteration-demo/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) +++ branches/RF-9040_build_updated_m2/examples/iteration-demo/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) @@ -1,32 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> - +  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd" +> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>9</version> + <version>10-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> @@ -35,7 +36,7 @@ <version>4.0.0-SNAPSHOT</version> <name>RichFaces Examples: Iteration</name> - <properties> + <properties> <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository> <jetty.port>8080</jetty.port> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -46,14 +47,17 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-parent</artifactId> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> -  +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> @@ -86,8 +90,8 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> - +  <dependency> <groupId>org.richfaces.core</groupId> @@ -103,12 +107,12 @@ </dependency>  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -173,14 +177,16 @@ <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector" + > <port>${jetty.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> </connectors> </configuration> </plugin> - </plugins> + </plugins> </build> <profiles> @@ -188,13 +194,13 @@ <id>jee6</id> <dependencies> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/RF-9040_build_updated_m2/examples/misc-demo/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/examples/misc-demo/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) +++ branches/RF-9040_build_updated_m2/examples/misc-demo/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) @@ -1,32 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> - +  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd" +> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>9</version> + <version>10-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> @@ -46,14 +47,17 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-parent</artifactId> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> -  +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> @@ -74,10 +78,10 @@ <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-ui</artifactId> </dependency> -  +  <dependency> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-ui</artifactId> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> </dependency> <dependency> <groupId>org.richfaces.core</groupId> @@ -85,12 +89,12 @@ </dependency> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -132,13 +136,13 @@ <id>jee6</id> <dependencies> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -184,7 +188,9 @@ <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector" + > <port>${jetty.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> Modified: branches/RF-9040_build_updated_m2/examples/output-demo/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/examples/output-demo/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) +++ branches/RF-9040_build_updated_m2/examples/output-demo/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" +> <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>9</version> + <version>10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -33,7 +34,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <org.richfaces.ui.version>4.0.0-SNAPSHOT</org.richfaces.ui.version> </properties> <build> @@ -78,13 +78,13 @@ <dependencies> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -133,9 +133,9 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-parent</artifactId> - <version>${version}</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> @@ -153,12 +153,12 @@ </dependency> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -194,7 +194,10 @@ <artifactId>ehcache</artifactId> </dependency> -  +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/examples/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/examples/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) +++ branches/RF-9040_build_updated_m2/examples/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) @@ -28,7 +28,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>7</version> + <version>10-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/RF-9040_build_updated_m2/examples/repeater-demo/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/examples/repeater-demo/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) +++ branches/RF-9040_build_updated_m2/examples/repeater-demo/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) @@ -1,33 +1,34 @@ <?xml version="1.0"?> - +  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd" +> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>9</version> + <version>10-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> @@ -54,7 +55,10 @@ <type>pom</type> </dependency> -  +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> @@ -72,12 +76,12 @@ <dependencies> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -102,7 +106,7 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> - </dependency> + </dependency> </dependencies> <profiles> @@ -110,13 +114,13 @@ <id>jee6</id> <dependencies> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -162,7 +166,9 @@ <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector" + > <port>${jetty.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> @@ -181,5 +187,5 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + </repositories> </project> Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/pom.xml 2010-08-12 21:05:59 UTC (rev 18602) @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" +> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>9</version> + <version>10-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> @@ -21,18 +23,18 @@ <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - + <jetty.port>8080</jetty.port> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <org.richfaces.ui.version>4.0.0-SNAPSHOT</org.richfaces.ui.version> + <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version> </properties> <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-parent</artifactId> - <version>${org.richfaces.ui.version}</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <version>${org.richfaces.bom.version}</version> <scope>import</scope> <type>pom</type> </dependency> @@ -49,12 +51,12 @@ <artifactId>richfaces-components-ui</artifactId> </dependency> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -81,7 +83,10 @@ <artifactId>ehcache</artifactId> </dependency> -  +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -129,7 +134,9 @@ <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector" + > <port>${jetty.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> @@ -228,13 +235,13 @@ <dependencies> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -243,11 +250,11 @@ <version>1.1</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </profile> </profiles> @@ -263,7 +270,7 @@ </snapshots> </repository> </repositories> - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/examples/richfaces...</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/examples/richfaces-sh...</developerConnection>

15 years, 9 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits August 2010