JBoss Rich Faces SVN: r17046 - in root/examples: core-demo/trunk and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-05-14 05:02:23 -0400 (Fri, 14 May 2010)
New Revision: 17046
Added:
root/examples/richfaces-showcase/
Removed:
root/examples/richfaces-demo/
Modified:
root/examples/core-demo/trunk/
root/examples/pom.xml
root/examples/repeater-demo/trunk/
root/examples/richfaces-showcase/trunk/pom.xml
root/examples/richfaces-showcase/trunk/src/main/webapp/WEB-INF/web.xml
Log:
https://jira.jboss.org/jira/browse/RFPL-599
Property changes on: root/examples/core-demo/trunk
___________________________________________________________________
Name: svn:ignore
+ target
Modified: root/examples/pom.xml
===================================================================
--- root/examples/pom.xml 2010-05-14 04:47:30 UTC (rev 17045)
+++ root/examples/pom.xml 2010-05-14 09:02:23 UTC (rev 17046)
@@ -38,7 +38,7 @@
<modules>
<module>core-demo/trunk</module>
<module>repeater-demo/trunk</module>
- <module>richfaces-demo/trunk</module>
+ <module>richfaces-showcase/trunk</module>
<!--<module>dist/trunk</module>-->
</modules>
Property changes on: root/examples/repeater-demo/trunk
___________________________________________________________________
Name: svn:ignore
+ target
Copied: root/examples/richfaces-showcase (from rev 17045, root/examples/richfaces-demo)
Modified: root/examples/richfaces-showcase/trunk/pom.xml
===================================================================
--- root/examples/richfaces-demo/trunk/pom.xml 2010-05-14 04:47:30 UTC (rev 17045)
+++ root/examples/richfaces-showcase/trunk/pom.xml 2010-05-14 09:02:23 UTC (rev 17046)
@@ -13,9 +13,9 @@
</parent>
<groupId>org.richfaces.examples</groupId>
- <artifactId>richfaces-demo</artifactId>
+ <artifactId>richfaces-showcase</artifactId>
<packaging>war</packaging>
- <name>Richfaces Examples: Richfaces Demo Application</name>
+ <name>Richfaces Examples: Richfaces Showcase Application</name>
<dependencies>
<dependency>
@@ -39,7 +39,7 @@
</dependencies>
<build>
- <finalName>richfaces-demo</finalName>
+ <finalName>richfaces-showcase</finalName>
</build>
<profiles>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- root/examples/richfaces-demo/trunk/src/main/webapp/WEB-INF/web.xml 2010-05-14 04:47:30 UTC (rev 17045)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/WEB-INF/web.xml 2010-05-14 09:02:23 UTC (rev 17046)
@@ -1,51 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- id="richfaces-demo" version="2.5">
-
- <display-name>richfaces-demo</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-
- <context-param>
- <param-name>org.richfaces.SKIN</param-name>
- <param-value>#{skinBean.skin}</param-value>
- </context-param>
-
- <context-param>
- <param-name>javax.faces.PROJECT_STAGE</param-name>
- <param-value>Development</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.richfaces.CONTROL_SKINNING</param-name>
- <param-value>enable</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name>
- <param-value>enable</param-value>
- </context-param>
-
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="richfaces-showcase" version="2.5">
+ <display-name>richfaces-showcase</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>#{skinBean.skin}</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.PROJECT_STAGE</param-name>
+ <param-value>Development</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.CONTROL_SKINNING</param-name>
+ <param-value>enable</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name>
+ <param-value>enable</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
</web-app>
\ No newline at end of file
14 years, 4 months
JBoss Rich Faces SVN: r17045 - root/docs/trunk/Developer_Guide/en-US.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2010-05-14 00:47:30 -0400 (Fri, 14 May 2010)
New Revision: 17045
Modified:
root/docs/trunk/Developer_Guide/en-US/Developer_Guide.xml
root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
Log:
Revised Maven usage based on feedback
Modified: root/docs/trunk/Developer_Guide/en-US/Developer_Guide.xml
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/Developer_Guide.xml 2010-05-14 00:59:39 UTC (rev 17044)
+++ root/docs/trunk/Developer_Guide/en-US/Developer_Guide.xml 2010-05-14 04:47:30 UTC (rev 17045)
@@ -3,7 +3,8 @@
]>
<book status="draft">
<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> --><xi:include href="chap-Developer_Guide-Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
+ <xi:include href="chap-Developer_Guide-Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="chap-Developer_Guide-Getting_started_with_RichFaces.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="chap-Developer_Guide-RichFaces_overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="chap-Developer_Guide-Basic_concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2010-05-14 00:59:39 UTC (rev 17044)
+++ root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2010-05-14 04:47:30 UTC (rev 17045)
@@ -32,11 +32,13 @@
<para>
RichFaces supports the following JSF implementations and frameworks:
<itemizedlist>
+ <!--
<listitem>
<para>
Facelets 1.1.1 – 1.2
</para>
</listitem>
+ -->
<listitem>
<para>
MyFaces 1.2.5
@@ -47,11 +49,13 @@
Seam 1.2 and higher
</para>
</listitem>
+ <!--
<listitem>
<para>
Sun JSF-RI 1.2_12
</para>
</listitem>
+ -->
</itemizedlist>
</para>
</listitem>
@@ -197,9 +201,15 @@
</para>
<section id="sect-Developer_Guide-Downloading_RichFaces-Compiling_the_source">
<title>Compiling the source</title>
+ <!-- Update download location in Enterprise docs, or remove this section altogether -->
<para>
Instead of downloading the pre-compiled binaries, you can download the source files and compile them yourself. Download the source files (also available in <filename class="extension">.bin.zip</filename> or <filename class="extension">.bin.tar.gz</filename> archives) from the JBoss RichFaces Downloads area at <ulink url="http://www.jboss.org/richfaces/download.html">http://www.jboss.org/richfaces/download.html</ulink>.
</para>
+ <!-- Remove SVN details in Enterprise docs -->
+ <para>
+ Alternatively, the source files can be downloaded from the anonymous SVN repository at <ulink url="http://anonsvn.jboss.org/repos/richfaces/root/">http://anonsvn.jboss.org/repos/richfaces/root/</ulink> using the following command:
+ </para>
+<screen>svn co http://anonsvn.jboss.org/repos/richfaces/root/</screen>
</section>
</section>
@@ -223,6 +233,7 @@
<para>
Add <filename>core-ui.jar</filename>, <filename>richfaces-api.jar</filename>, and <filename>richfaces-impl.jar</filename> into your project by dragging them from the location where you unzipped the RichFaces archive to the <filename>WebContent/WEB-INF/lib/</filename> directory of your project in <application>JBoss Tools</application>.
</para>
+ <!--
<note>
<title>Other required libraries</title>
<para>
@@ -256,6 +267,7 @@
</listitem>
</itemizedlist>
</note>
+ -->
</step>
<step id="step-Developer_Guide-Creating_a_project-Reference_the_tag_libraries">
<title>Reference the tag libraries</title>
@@ -370,6 +382,11 @@
</para>
<programlisting language="XML" role="XML"><xi:include parse="text" href="extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Add_dependencies.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+
+ <!-- Remove the following for Enterprise documentation -->
+ <para>
+ If you wish to include modules for test-driven JSF development, add any dependencies for the tests to the <filename>pom.xml</filename> file. For full details on how to use the <productname>jsf-test</productname> project, refer to <ulink url="http://community.jboss.org/docs/DOC-13155">http://community.jboss.org/wiki/TestDrivenJSFDevelopment</ulink>.
+ </para>
</step>
<!--
@@ -380,14 +397,12 @@
<para>
After the project has been generated from the old archetype, it must be updated to use RichFaces &VERSION; and JSF 2.
</para>
+ <para>
+ RichFaces &VERSION; uses Facelets and does not support JSP. Any <filename>index.jsp</filename> pages that were generated need to forward <filename>home.jsf</filename> page equivalents.
+ </para>
+ <!--
<substeps>
<step>
- <title>Replace <filename>index.jsp</filename> pages</title>
- <para>
- RichFaces &VERSION; does not support JSP. Any <filename>index.jsp</filename> pages that were generated must be replaced with <filename>index.xhtml</filename> page equivalents.
- </para>
- </step>
- <step>
<title>Deactivate the VDL view handler</title>
<para>
The <acronym>VDL</acronym> (View Definition Language) view handler must be deactivated for your project to work with JSF 2. To deactivate the viewhandler, edit the project's <filename>web.xml</filename> settings file with the following context parameter:
@@ -395,9 +410,9 @@
<programlisting language="XML" role="XML"><xi:include parse="text" href="extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Update_the_generated_project.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
</step>
</substeps>
+ -->
</step>
-
<step id="step-Developer_Guide-Using_RichFaces_with_Maven-Build_the_project">
<title>Build the project</title>
<para>
@@ -407,21 +422,39 @@
The <computeroutput>BUILD SUCCESSFUL</computeroutput> message indicates the project has been assembled and is ready to import into an IDE (integrated development environment).
</para>
</step>
+
<step id="step-Developer_Guide-Build_the_project-Building_for_Eclipse_and_JBoss_Tools">
<title>Import the project into an IDE</title>
<para>
- Import the Maven project into your IDE.
+ Import the Maven project into your IDE. For <application>Eclipse</application> and <application>JBoss Tools</application>, you can either use <application>Maven</application> to prepare the project, or import the project using the <productname>M2Eclipse</productname> plug-in.
</para>
- <para>
- For <application>Eclipse</application> and <application>JBoss Tools</application>, you need to have the <productname>M2Eclipse</productname> plug-in installed. You can then import the <application>Maven</application> project through a wizard by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice> from the menu. Select <guilabel>Maven Projects</guilabel> as the input source and choose the <filename>pom.xml</filename> file for your project.
- </para>
+ <stepalternatives>
+ <step>
+ <title>Using <application>Maven</application> to prepare the project for <application>Eclipse</application></title>
+ <para>
+ Enter the following command in the root directory of the project:
+ </para>
+<screen>mvn eclipse:eclipse -DdownloadSources=true -Dwtpversion=2.0</screen>
+ <para>
+ The command generates the required <application>Eclipse</application> project files. You can then import the project into <application>Eclipse</application> and <application>JBoss Tools</application> through the importing wizard by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice> from the menu. Select <menuchoice><guimenu>General</guimenu><guimenuitem>Existing Projects into Workspace</guimenuitem></menuchoice> as the import source and choose the root directory for your project.
+ </para>
+ </step>
+ <step>
+ <title>Using the <productname>M2Eclipse</productname> plug-in</title>
+ <para>
+ Alternatively, you can import a <application>Maven</application> project into <application>Eclipse</application> and <application>JBoss Tools</application> using the <productname>M2Eclipse</productname> plug-in. With the plug-in installed, open the importing wizard by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice> from the menu. Select <menuchoice><guimenu>Maven</guimenu><guimenuitem>Existing Maven Projects</guimenuitem></menuchoice> as the import source and choose the <filename>pom.xml</filename> file for your project.
+ </para>
+ </step>
+ </stepalternatives>
</step>
+ <!--
<step id="step-Developer_Guide-Using_RichFaces_with_Maven-Add_tag_library_references">
<title>Add tag library references</title>
<para>
After importing, edit the <filename><replaceable>jsf-app</replaceable>/src/main/webapp/pages/index.xhtml</filename> file to include the tag library declaration as described in <xref linkend="step-Developer_Guide-Creating_a_project-Reference_the_tag_libraries" /> of <xref linkend="sect-Developer_Guide-Getting_started_with_RichFaces-Creating_a_project" />.
</para>
</step>
+ -->
</procedure>
<para>
14 years, 4 months
JBoss Rich Faces SVN: r17044 - root/core/trunk/impl/src/main/java/org/richfaces/context.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-13 20:59:39 -0400 (Thu, 13 May 2010)
New Revision: 17044
Modified:
root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java
Log:
Fixed a checkstyle issue - only static final can be all caps.
Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java
===================================================================
--- root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java 2010-05-13 22:38:01 UTC (rev 17043)
+++ root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java 2010-05-14 00:59:39 UTC (rev 17044)
@@ -47,7 +47,7 @@
*/
public final class ComponentIdResolver {
- private static RendererUtils RENDERER_UTILS = RendererUtils.getInstance();
+ private static RendererUtils renderUtils = RendererUtils.getInstance();
private static Map<String, String> metaComponentSubstitutions = new HashMap<String, String>();
@@ -310,7 +310,7 @@
break;
} else {
if (resolvedId != null) {
- String predefinedMetaComponentId = RENDERER_UTILS.getPredefinedMetaComponentId(facesContext,
+ String predefinedMetaComponentId = renderUtils.getPredefinedMetaComponentId(facesContext,
bottomMatch, resolvedId);
if (predefinedMetaComponentId != null) {
14 years, 4 months
JBoss Rich Faces SVN: r17043 - in root/examples/core-demo/trunk/src/main: webapp and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-05-13 18:38:01 -0400 (Thu, 13 May 2010)
New Revision: 17043
Modified:
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java
root/examples/core-demo/trunk/src/main/webapp/region.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-8639
Modified: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java 2010-05-13 22:16:19 UTC (rev 17042)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java 2010-05-13 22:38:01 UTC (rev 17043)
@@ -24,6 +24,7 @@
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
import javax.faces.event.AjaxBehaviorEvent;
+import javax.faces.event.ValueChangeEvent;
import javax.faces.model.SelectItem;
/**
@@ -34,15 +35,15 @@
@SessionScoped
public class RegionBean {
- private static final SelectItem[] POSSIBLE_EXECUTE_OPTIONS = new SelectItem[] {
- new SelectItem("@region"), new SelectItem("@all")
+ private static final SelectItem[] AVAILABLE_EXECUTE_OPTIONS = new SelectItem[] {
+ new SelectItem(null, "default"), new SelectItem("@region"), new SelectItem("@all"), new SelectItem("@this")
};
- private String execute = getInitialExecuteValue();
+ private String execute = null;
- private String nestedExecute = getInitialExecuteValue();
+ private String nestedExecute = null;
- private String outerExecute = getInitialExecuteValue();
+ private String outerExecute = null;
private String outerValue;
@@ -52,12 +53,8 @@
private String lastExecutedLinkValue;
- private String getInitialExecuteValue() {
- return (String) POSSIBLE_EXECUTE_OPTIONS[POSSIBLE_EXECUTE_OPTIONS.length - 1].getValue();
- }
-
public SelectItem[] getExecuteOptions() {
- return POSSIBLE_EXECUTE_OPTIONS;
+ return AVAILABLE_EXECUTE_OPTIONS;
}
public String getOuterValue() {
@@ -115,4 +112,12 @@
public String getLastExecutedLinkValue() {
return lastExecutedLinkValue;
}
+
+ public void handleDefaultsValueChange(ValueChangeEvent event) {
+ String newValue = (String) event.getNewValue();
+
+ setOuterExecute(newValue);
+ setExecute(newValue);
+ setNestedExecute(newValue);
+ }
}
Modified: root/examples/core-demo/trunk/src/main/webapp/region.xhtml
===================================================================
--- root/examples/core-demo/trunk/src/main/webapp/region.xhtml 2010-05-13 22:16:19 UTC (rev 17042)
+++ root/examples/core-demo/trunk/src/main/webapp/region.xhtml 2010-05-13 22:38:01 UTC (rev 17043)
@@ -29,6 +29,14 @@
<utils:highlighter />
<h:form>
+ <h:outputLabel value="Defaults for all" for="defaultsSelect"/>
+ <h:selectOneMenu id="defaultsSelect" valueChangeListener="#{regionBean.handleDefaultsValueChange}" onchange="submit()">
+ <f:selectItems value="#{regionBean.executeOptions}" />
+ </h:selectOneMenu>
+ <br />
+ </h:form>
+
+ <h:form>
<h:outputLabel value="Out of region" for="outerSelect"/>
<h:selectOneMenu id="outerSelect" value="#{regionBean.outerExecute}" onchange="submit()">
<f:selectItems value="#{regionBean.executeOptions}" />
14 years, 4 months
JBoss Rich Faces SVN: r17042 - root/core/trunk/impl/src/main/java/org/richfaces/context.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-05-13 18:16:19 -0400 (Thu, 13 May 2010)
New Revision: 17042
Modified:
root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java
Log:
https://jira.jboss.org/jira/browse/RF-8639
Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java
===================================================================
--- root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java 2010-05-13 21:47:44 UTC (rev 17041)
+++ root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java 2010-05-13 22:16:19 UTC (rev 17042)
@@ -37,6 +37,7 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.component.AjaxContainer;
import org.richfaces.component.MetaComponentResolver;
@@ -46,6 +47,8 @@
*/
public final class ComponentIdResolver {
+ private static RendererUtils RENDERER_UTILS = RendererUtils.getInstance();
+
private static Map<String, String> metaComponentSubstitutions = new HashMap<String, String>();
static {
@@ -307,6 +310,12 @@
break;
} else {
if (resolvedId != null) {
+ String predefinedMetaComponentId = RENDERER_UTILS.getPredefinedMetaComponentId(facesContext,
+ bottomMatch, resolvedId);
+
+ if (predefinedMetaComponentId != null) {
+ resolvedId = predefinedMetaComponentId;
+ }
resolvedIds.add(resolvedId);
} else {
String computedId = computeClientId(facesContext, topMatch, fullId);
14 years, 4 months
JBoss Rich Faces SVN: r17041 - in root/ui-sandbox/tables/trunk: ui/src/main/java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-05-13 17:47:44 -0400 (Thu, 13 May 2010)
New Revision: 17041
Modified:
root/ui-sandbox/tables/trunk/impl/src/test/java/org/richfaces/model/ArrangeableModelTest.java
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIColumnTest.java
root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIDataTableBaseTest.java
root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIExtendedDataTableTest.java
Log:
Removed @Override usage for interfaces
Modified: root/ui-sandbox/tables/trunk/impl/src/test/java/org/richfaces/model/ArrangeableModelTest.java
===================================================================
--- root/ui-sandbox/tables/trunk/impl/src/test/java/org/richfaces/model/ArrangeableModelTest.java 2010-05-13 20:53:52 UTC (rev 17040)
+++ root/ui-sandbox/tables/trunk/impl/src/test/java/org/richfaces/model/ArrangeableModelTest.java 2010-05-13 21:47:44 UTC (rev 17041)
@@ -91,7 +91,6 @@
ExpressionFactory expressionFactory = facesContext.getApplication().getExpressionFactory();
ELContext elContext = facesContext.getELContext();
FilterField[] filterFields = {new FilterField(null, new Filter<User>() {
- @Override
public boolean accept(User t) {
return t.getFname().indexOf('a') == -1;
}
@@ -100,7 +99,6 @@
SortField[] sortFields = {new SortField(expressionFactory
.createValueExpression(elContext, "#{var.fname}", Object.class), null, SortOrder.ASCENDING),
new SortField(null, new Comparator<User>() {
- @Override
public int compare(User o1, User o2) {
return o1.getLname().compareTo(o2.getLname());
}
@@ -177,7 +175,6 @@
public void testWalk() {
final List<Object> rowKeys = new ArrayList<Object>();
DataVisitor visitor = new DataVisitor() {
- @Override
public DataVisitResult process(FacesContext context, Object rowKey, Object argument) {
arrangeableModel.setRowKey(rowKey);
if (arrangeableModel.isRowAvailable()) {
@@ -203,7 +200,6 @@
public void testDataModelListener() {
Assert.assertEquals(0, extendedDataModel.getDataModelListeners().length);
DataModelListener listener = new DataModelListener() {
- @Override
public void rowSelected(DataModelEvent event) {
}
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-05-13 20:53:52 UTC (rev 17040)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-05-13 21:47:44 UTC (rev 17041)
@@ -77,7 +77,6 @@
this.delegateCallback = delegateCallback;
}
- @Override
public VisitResult visit(VisitContext visitContext, UIComponent target) {
if (UIExtendedDataTable.this.equals(target)) {
FacesContext context = visitContext.getFacesContext();
@@ -117,7 +116,6 @@
clientFirst, clientRows
}
- @Override
public String resolveClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) {
if (SUPPORTED_META_COMPONENTS.contains(metaComponentId)) {
Object oldRowKey = getRowKey();
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-13 20:53:52 UTC (rev 17040)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-13 21:47:44 UTC (rev 17041)
@@ -193,6 +193,7 @@
if (table.isColumnFacetPresent(facetName)) {
encodeColumnFacetsProlog(state);
for (state.startIterate(); state.hasNextPart();) {
+ //TODO nick - review this part of code
state.nextPart();
encodeColumnFacetsPart(state);
}
@@ -478,7 +479,6 @@
return UIExtendedDataTable.class;
}
- @Override
public void encodeMetaComponent(FacesContext context, UIComponent component) throws IOException {
String metaComponentId = (String) context.getAttributes().get(ExtendedVisitContext.META_COMPONENT_ID);
@@ -518,7 +518,6 @@
char partNameFirstChar = state.nextPart().getName().toString().charAt(0);
final List<String> ids = new LinkedList<String>();
table.walk(context, new DataVisitor() {
- @Override
public DataVisitResult process(FacesContext context, Object rowKey, Object argument) {
UIDataTableBase dataTable = state.getRow();
dataTable.setRowKey(context, rowKey);
@@ -528,7 +527,6 @@
}
}, removeRange, null);
table.walk(context, new DataVisitor() {
- @Override
public DataVisitResult process(FacesContext context, Object rowKey, Object argument) {
UIDataTableBase dataTable = state.getRow();
dataTable.setRowKey(context, rowKey);
Modified: root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIColumnTest.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIColumnTest.java 2010-05-13 20:53:52 UTC (rev 17040)
+++ root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIColumnTest.java 2010-05-13 21:47:44 UTC (rev 17041)
@@ -87,7 +87,6 @@
public final void testFilter() {
Assert.assertNull(column.getFilter());
Filter<?> filter = new Filter<Object>() {
- @Override
public boolean accept(Object t) {
return false;
}
@@ -118,7 +117,6 @@
public final void testComparator() {
Assert.assertNull(column.getComparator());
Comparator<?> comparator = new Comparator<Object>() {
- @Override
public int compare(Object o1, Object o2) {
return 0;
}
@@ -138,7 +136,6 @@
expect(expression.isLiteralText()).andStubReturn(false);
environment.replay();
Filter<?> filter = new Filter<Object>() {
- @Override
public boolean accept(Object t) {
return false;
}
@@ -163,7 +160,6 @@
expect(expression.isLiteralText()).andStubReturn(false);
environment.replay();
Comparator<?> comparator = new Comparator<Object>() {
- @Override
public int compare(Object o1, Object o2) {
return 0;
}
Modified: root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIDataTableBaseTest.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIDataTableBaseTest.java 2010-05-13 20:53:52 UTC (rev 17040)
+++ root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIDataTableBaseTest.java 2010-05-13 21:47:44 UTC (rev 17041)
@@ -102,7 +102,6 @@
public void setWrappedData(Object data) {
}
- @Override
public void arrange(FacesContext context, ArrangeableState state) {
this.state = state;
}
Modified: root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIExtendedDataTableTest.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIExtendedDataTableTest.java 2010-05-13 20:53:52 UTC (rev 17040)
+++ root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIExtendedDataTableTest.java 2010-05-13 21:47:44 UTC (rev 17041)
@@ -95,7 +95,6 @@
public final void testWalkFacesContextDataVisitorRangeObject() {
final StringBuilder builder = new StringBuilder(5);
table.walk(facesContext, new DataVisitor() {
- @Override
public DataVisitResult process(FacesContext context, Object rowKey, Object argument) {
table.setRowKey(rowKey);
builder.append(table.getRowData());
14 years, 4 months
JBoss Rich Faces SVN: r17040 - in root/examples-sandbox/trunk: components and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-05-13 16:53:52 -0400 (Thu, 13 May 2010)
New Revision: 17040
Modified:
root/examples-sandbox/trunk/components/pom.xml
root/examples-sandbox/trunk/components/tables/pom.xml
root/examples-sandbox/trunk/pom.xml
Log:
pom.xml files in examples-sandbox updated with new artifact names
Modified: root/examples-sandbox/trunk/components/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/pom.xml 2010-05-13 20:41:35 UTC (rev 17039)
+++ root/examples-sandbox/trunk/components/pom.xml 2010-05-13 20:53:52 UTC (rev 17040)
@@ -16,20 +16,12 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
- <artifactId>${example.componentName}-ui</artifactId>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>${example.componentName}-bom</artifactId>
<version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
- <artifactId>${example.componentName}-api</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
- <artifactId>${example.componentName}-impl</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
\ No newline at end of file
Modified: root/examples-sandbox/trunk/components/tables/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-13 20:41:35 UTC (rev 17039)
+++ root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-13 20:53:52 UTC (rev 17040)
@@ -38,24 +38,24 @@
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
+ <groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>${example.componentName}-ui</artifactId>
</dependency>
<dependency>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
+ <groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>${example.componentName}-api</artifactId>
</dependency>
<dependency>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
+ <groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>${example.componentName}-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
+ <groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>datascroller-api</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
+ <groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>datascroller-ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
Modified: root/examples-sandbox/trunk/pom.xml
===================================================================
--- root/examples-sandbox/trunk/pom.xml 2010-05-13 20:41:35 UTC (rev 17039)
+++ root/examples-sandbox/trunk/pom.xml 2010-05-13 20:53:52 UTC (rev 17040)
@@ -30,11 +30,11 @@
</site-->
</distributionManagement>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
<!-- simple logger binding: only messages of level INFO and higher are printed-->
<dependency>
14 years, 4 months
JBoss Rich Faces SVN: r17039 - root/commons/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-13 16:41:35 -0400 (Thu, 13 May 2010)
New Revision: 17039
Removed:
root/commons/trunk/checkstyle-suppressions.xml
Log:
part of move of suppressions to /api
Deleted: root/commons/trunk/checkstyle-suppressions.xml
===================================================================
--- root/commons/trunk/checkstyle-suppressions.xml 2010-05-13 20:40:58 UTC (rev 17038)
+++ root/commons/trunk/checkstyle-suppressions.xml 2010-05-13 20:41:35 UTC (rev 17039)
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.0//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-
-<suppressions>
- <suppress checks="DoubleCheckedLocking" files="MultipartRequestRegistry.java" />
- <suppress checks="FallThrough" files="JSMin.java" />
- <suppress checks="IllegalCatch" files="UISwitchablePanel.java" />
- <suppress checks="ModifiedControlVariable" files="MultipartRequest.java" />
- <suppress checks="IllegalCatch" files="StagingServer.java" />
- <suppress checks="IllegalCatch" files="PartialViewContextImpl.java" />
- <suppress checks="FallThrough" files="StagingServer.java" />
- <suppress checks="ModifiedControlVariable" files="Cookie.java" />
- <suppress checks="IllegalCatch" files="CacheManager.java" />
- <suppress checks="MissingSwitchDefault" files="JSONTokener.java" />
- <suppress checks="IllegalCatch" files="AjaxViewRoot.java" />
- <suppress checks="FallThrough" files="XMLTokener.java" />
- <suppress checks="IllegalCatch" files="ResourceHandlerImpl.java" />
- <suppress checks="IllegalThrows" files="AbstractThreadedTest.java" />
- <suppress checks="ModifiedControlVariable" files="URLCodec.java" />
-
- <!-- TODO it is hot fix for building process, this files belong to the test-base module,
- and must be removed from here -->
- <suppress checks="IllegalCatch" files="AbstractThreadedTest.java" />
- <suppress checks="IllegalCatch" files="StagingServer.java" />
-</suppressions>
14 years, 4 months
JBoss Rich Faces SVN: r17038 - root/commons/trunk/api.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-13 16:40:58 -0400 (Thu, 13 May 2010)
New Revision: 17038
Added:
root/commons/trunk/api/checkstyle-suppressions.xml
Log:
Moved suppressions to api directory so each api can build on its own.
Copied: root/commons/trunk/api/checkstyle-suppressions.xml (from rev 17028, root/commons/trunk/checkstyle-suppressions.xml)
===================================================================
--- root/commons/trunk/api/checkstyle-suppressions.xml (rev 0)
+++ root/commons/trunk/api/checkstyle-suppressions.xml 2010-05-13 20:40:58 UTC (rev 17038)
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+ <suppress checks="DoubleCheckedLocking" files="MultipartRequestRegistry.java" />
+ <suppress checks="FallThrough" files="JSMin.java" />
+ <suppress checks="IllegalCatch" files="UISwitchablePanel.java" />
+ <suppress checks="ModifiedControlVariable" files="MultipartRequest.java" />
+ <suppress checks="IllegalCatch" files="StagingServer.java" />
+ <suppress checks="IllegalCatch" files="PartialViewContextImpl.java" />
+ <suppress checks="FallThrough" files="StagingServer.java" />
+ <suppress checks="ModifiedControlVariable" files="Cookie.java" />
+ <suppress checks="IllegalCatch" files="CacheManager.java" />
+ <suppress checks="MissingSwitchDefault" files="JSONTokener.java" />
+ <suppress checks="IllegalCatch" files="AjaxViewRoot.java" />
+ <suppress checks="FallThrough" files="XMLTokener.java" />
+ <suppress checks="IllegalCatch" files="ResourceHandlerImpl.java" />
+ <suppress checks="IllegalThrows" files="AbstractThreadedTest.java" />
+ <suppress checks="ModifiedControlVariable" files="URLCodec.java" />
+
+ <!-- TODO it is hot fix for building process, this files belong to the test-base module,
+ and must be removed from here -->
+ <suppress checks="IllegalCatch" files="AbstractThreadedTest.java" />
+ <suppress checks="IllegalCatch" files="StagingServer.java" />
+</suppressions>
14 years, 4 months
JBoss Rich Faces SVN: r17037 - in root/ui-sandbox/datascroller/trunk: api and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-05-13 16:34:29 -0400 (Thu, 13 May 2010)
New Revision: 17037
Added:
root/ui-sandbox/datascroller/trunk/bom/
root/ui-sandbox/datascroller/trunk/bom/pom.xml
root/ui-sandbox/datascroller/trunk/parent/
root/ui-sandbox/datascroller/trunk/parent/pom.xml
Modified:
root/ui-sandbox/datascroller/trunk/api/pom.xml
root/ui-sandbox/datascroller/trunk/pom.xml
root/ui-sandbox/datascroller/trunk/ui/pom.xml
Log:
Datascroller module: switch to new build structure
Modified: root/ui-sandbox/datascroller/trunk/api/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/api/pom.xml 2010-05-13 19:19:00 UTC (rev 17036)
+++ root/ui-sandbox/datascroller/trunk/api/pom.xml 2010-05-13 20:34:29 UTC (rev 17037)
@@ -1,20 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
<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.sandbox.ui.components</groupId>
- <artifactId>datascroller</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>${parent.artifactId}-api</artifactId>
- <name>richfaces datascroller api</name>
+ <parent>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
- <dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-api</artifactId>
+ <name>Richfaces UI Components: Datascroller API</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <!-- runtime -->
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <!-- todo remove this dependency or move to test scope -->
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ </dependency>
+
+ <!-- JSF with dependencies -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</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>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- todo api? -->
+ <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
Added: root/ui-sandbox/datascroller/trunk/bom/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/bom/pom.xml (rev 0)
+++ root/ui-sandbox/datascroller/trunk/bom/pom.xml 2010-05-13 20:34:29 UTC (rev 17037)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
+<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>1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-bom</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <name>Richfaces UI Components: Datascroller BOM</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <richfaces.core.api.version>4.0.0-SNAPSHOT</richfaces.core.api.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-bom</artifactId>
+ <version>${richfaces.core.api.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Added: root/ui-sandbox/datascroller/trunk/parent/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/parent/pom.xml (rev 0)
+++ root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-13 20:34:29 UTC (rev 17037)
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
+<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.ui-sandbox</groupId>
+ <artifactId>datascroller-bom</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-parent</artifactId>
+ <name>Richfaces UI Components: Datascroller Parent Module</name>
+ <packaging>pom</packaging>
+
+ <distributionManagement>
+ <downloadUrl>
+ http://labs.jboss.com/portal/jbossrichfaces/downloads
+ </downloadUrl>
+ <repository>
+ <id>jboss-releases-repository</id>
+ <uniqueVersion>false</uniqueVersion>
+ <url>${releaseRepository}</url>
+ </repository>
+ <snapshotRepository>
+ <id>jboss-snapshots-repository</id>
+ <uniqueVersion>true</uniqueVersion>
+ <url>${snapshotRepository}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-4</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <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.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <configuration>
+ <library>
+ <prefix>org.richfaces</prefix>
+ <taglib>
+ <uri>http://richfaces.org/datascroller</uri>
+ <shortName>ds</shortName>
+ <displayName>Datascroller components tags</displayName>
+ </taglib>
+ </library>
+ </configuration>
+ <executions>
+ <execution>
+ <id>cdk-generate-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Archetypes dependency -->
+ <dependency>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-4</version>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>htmlunit-client</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-stage</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Modified: root/ui-sandbox/datascroller/trunk/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-13 19:19:00 UTC (rev 17036)
+++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-13 20:34:29 UTC (rev 17037)
@@ -1,34 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
<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.sandbox.ui</groupId>
- <artifactId>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
- <artifactId>datascroller</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-aggregator</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
- <name>richfaces datascroller</name>
+ <name>Richfaces UI Components: Datascroller Aggregator</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-cdk-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<modules>
+ <module>bom</module>
+ <module>parent</module>
<module>api</module>
- <module>ui</module>
- </modules>
+ <module>ui</module>
+ </modules>
</project>
\ No newline at end of file
Modified: root/ui-sandbox/datascroller/trunk/ui/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/ui/pom.xml 2010-05-13 19:19:00 UTC (rev 17036)
+++ root/ui-sandbox/datascroller/trunk/ui/pom.xml 2010-05-13 20:34:29 UTC (rev 17037)
@@ -1,29 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
<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.sandbox.ui.components</groupId>
- <artifactId>datascroller</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-ui</artifactId>
+ <name>Richfaces UI Components: Datascroller UI</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-api</artifactId>
+ </dependency>
+
+ <!-- JSF with dependencies -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</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>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- todo api? -->
+ <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>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>${parent.artifactId}-ui</artifactId>
- <name>richfaces datascroller ui</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <artifactId>${parent.artifactId}-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- </dependency>
- </dependencies>
-
</project>
\ No newline at end of file
14 years, 4 months