JBoss Rich Faces SVN: r17016 - root/core/trunk/parent.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-05-13 08:20:33 -0400 (Thu, 13 May 2010)
New Revision: 17016
Modified:
root/core/trunk/parent/pom.xml
Log:
Changed HtmlUnit version to 2.5 to fix unit tests
Modified: root/core/trunk/parent/pom.xml
===================================================================
--- root/core/trunk/parent/pom.xml 2010-05-13 12:15:08 UTC (rev 17015)
+++ root/core/trunk/parent/pom.xml 2010-05-13 12:20:33 UTC (rev 17016)
@@ -67,7 +67,23 @@
<artifactId>htmlunit-client</artifactId>
<version>1.0.3</version>
</dependency>
- <dependency>
+
+ <!--
+ These dependencies are usually provided by org.jboss.test-jsf:htmlunit-client,
+ but the latest 2.7 HtmlUnit version has problems with jQuery, so we are overriding
+ version back to 2.5.
+ -->
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit-core-js</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.5.2</version>
14 years, 5 months
JBoss Rich Faces SVN: r17015 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-05-13 08:15:08 -0400 (Thu, 13 May 2010)
New Revision: 17015
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Taglib.java
Log:
Missing adapter annotation added
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Taglib.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Taglib.java 2010-05-13 11:39:11 UTC (rev 17014)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Taglib.java 2010-05-13 12:15:08 UTC (rev 17015)
@@ -26,7 +26,10 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.richfaces.cdk.xmlconfig.model.ClassAdapter;
+
/**
* This class contains information about tag library.
* @author asmirnov
@@ -61,6 +64,7 @@
/**
* @return the listenerClass
*/
+ @XmlJavaTypeAdapter(ClassAdapter.class)
public ClassName getListenerClass() {
return this.listenerClass;
}
@@ -145,6 +149,7 @@
/**
* @return the validatorClass
*/
+ @XmlJavaTypeAdapter(ClassAdapter.class)
public ClassName getValidatorClass() {
return this.validatorClass;
}
14 years, 5 months
JBoss Rich Faces SVN: r17014 - in root/examples: core-demo/trunk and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-13 07:39:11 -0400 (Thu, 13 May 2010)
New Revision: 17014
Modified:
root/examples/core-demo/trunk/pom.xml
root/examples/pom.xml
root/examples/repeater-demo/trunk/pom.xml
root/examples/richfaces-demo/trunk/pom.xml
Log:
change richfaces build structure
https://community.jboss.org/wiki/RichFaces40BuildDirectoryStructure
restructured examples
Modified: root/examples/core-demo/trunk/pom.xml
===================================================================
--- root/examples/core-demo/trunk/pom.xml 2010-05-13 09:46:05 UTC (rev 17013)
+++ root/examples/core-demo/trunk/pom.xml 2010-05-13 11:39:11 UTC (rev 17014)
@@ -25,40 +25,33 @@
<parent>
<groupId>org.richfaces.examples</groupId>
- <artifactId>examples-root</artifactId>
+ <artifactId>examples-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.examples</groupId>
- <artifactId>${example.componentName}-demo</artifactId>
+ <artifactId>core-demo</artifactId>
<packaging>war</packaging>
<name>RichFaces Examples: Core</name>
- <properties>
- <example.componentName>core</example.componentName>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>${example.componentName}</artifactId>
+ <artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.1.0.GA</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: root/examples/pom.xml
===================================================================
--- root/examples/pom.xml 2010-05-13 09:46:05 UTC (rev 17013)
+++ root/examples/pom.xml 2010-05-13 11:39:11 UTC (rev 17014)
@@ -151,11 +151,10 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -171,48 +170,13 @@
</connectors>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
-
- <dependencies>
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <executions>
- <execution>
- <id>richfaces-checkstyle-report</id>
- <configuration>
- <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
- <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
- </configuration>
-
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
-
- <configuration>
- <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
- <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
- </configuration>
</plugin>
</plugins>
</reporting>
Modified: root/examples/repeater-demo/trunk/pom.xml
===================================================================
--- root/examples/repeater-demo/trunk/pom.xml 2010-05-13 09:46:05 UTC (rev 17013)
+++ root/examples/repeater-demo/trunk/pom.xml 2010-05-13 11:39:11 UTC (rev 17014)
@@ -25,13 +25,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>examples</artifactId>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>examples-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.examples</groupId>
- <artifactId>repeater</artifactId>
+ <artifactId>repeater-demo</artifactId>
<packaging>war</packaging>
<name>Richfaces Examples: Repeater</name>
Modified: root/examples/richfaces-demo/trunk/pom.xml
===================================================================
--- root/examples/richfaces-demo/trunk/pom.xml 2010-05-13 09:46:05 UTC (rev 17013)
+++ root/examples/richfaces-demo/trunk/pom.xml 2010-05-13 11:39:11 UTC (rev 17014)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
- <artifactId>examples-root</artifactId>
+ <artifactId>examples-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
14 years, 5 months
JBoss Rich Faces SVN: r17013 - in root/core/trunk: impl and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-13 05:46:05 -0400 (Thu, 13 May 2010)
New Revision: 17013
Added:
root/core/trunk/impl/checkstyle-suppressions.xml
Removed:
root/core/trunk/checkstyle-suppressions.xml
Log:
fix problems with checkstyle
Deleted: root/core/trunk/checkstyle-suppressions.xml
===================================================================
--- root/core/trunk/checkstyle-suppressions.xml 2010-05-13 06:01:36 UTC (rev 17012)
+++ root/core/trunk/checkstyle-suppressions.xml 2010-05-13 09:46:05 UTC (rev 17013)
@@ -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>
Copied: root/core/trunk/impl/checkstyle-suppressions.xml (from rev 17012, root/core/trunk/checkstyle-suppressions.xml)
===================================================================
--- root/core/trunk/impl/checkstyle-suppressions.xml (rev 0)
+++ root/core/trunk/impl/checkstyle-suppressions.xml 2010-05-13 09:46:05 UTC (rev 17013)
@@ -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, 5 months
JBoss Rich Faces SVN: r17012 - in root/docs/trunk/Developer_Guide/en-US: extras and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2010-05-13 02:01:36 -0400 (Thu, 13 May 2010)
New Revision: 17012
Added:
root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Add_dependencies.xml_sample
root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Update_the_generated_project.xml_sample
Modified:
root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Add_required_repositories.xml_sample
Log:
Revised Maven usage
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-12 22:53:13 UTC (rev 17011)
+++ root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2010-05-13 06:01:36 UTC (rev 17012)
@@ -296,74 +296,108 @@
</para>
<programlisting language="XML" role="XML"><activeProfiles>
- <activeProfile>jsf-app-profile</activeProfile>
+ <activeProfile>jboss-public-repository</activeProfile>
</activeProfiles>
</programlisting>
</step>
- <step id="step-Developer_Guide-Using_RichFaces_with_Maven-Generate_project_from_archetype">
- <title>Generate project from archetype</title>
+ <step id="step-Developer_Guide-Using_RichFaces_with_Maven-Generate_the_project_from_the_archetype">
+ <title>Generate the project from the archetype</title>
+
+<!--
+<remark>ONCE 4.0 ARCHETYPE IS COMPLETE:</remark>
<para>
- The project can now be generated with the <filename>maven-archetype-jsfwebapp</filename> <remark>(may be renamed in a later release)</remark> archetype. Create a new directory for your project, then run the following Maven command:
-<screen>mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=4.0.0-SNAPSHOT -DgroupId=<replaceable>org.docs.richfaces</replaceable> -DartifactId=<replaceable>jsf-app</replaceable>
-</screen>
+ The project can now be generated with the <filename>maven-archetype-jsfwebapp</filename> <remark>(may be renamed in a later release)</remark> archetype. Create a new directory for your project, then run the following Maven command:
</para>
+<screen>mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=4.0.0-SNAPSHOT -DgroupId=<replaceable>org.docs.richfaces</replaceable> -DartifactId=<replaceable>jsf-app</replaceable></screen>
+-->
+
<para>
- The following parameters can be used to customize your project:
- <variablelist>
- <varlistentry>
- <term><command>-DgroupId</command></term>
- <listitem>
- <para>
- Defines the package for the Managed Beans
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><command>-DartifactId</command></term>
- <listitem>
- <para>
- Defines the name of the project
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
+ The project can now be generated with the <filename>maven-archetype-jsfwebapp</filename> archetype. The archetype for RichFaces 4.0 is still in development; use the archetype for RichFaces 3.3.3 to generate a project until the 4.0 archetype is released. Create a new directory for your project, then run the following Maven command:
</para>
+<screen>mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.3-SNAPSHOT -DgroupId=<replaceable>org.docs.richfaces</replaceable> -DartifactId=<replaceable>jsf-app</replaceable></screen>
<para>
- The command generates a JSF project with the following structure:
+ The following parameters can be used to customize your project:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term><command>-DgroupId</command></term>
+ <listitem>
+ <para>
+ Defines the package for the Managed Beans
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><command>-DartifactId</command></term>
+ <listitem>
+ <para>
+ Defines the name of the project
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>
+ The command generates a JSF project with the following structure:
+ </para>
<screen><replaceable>jsf-app</replaceable>
-├── pom.xml
-└── src
- ├── main
- │ ├── java
- │ │ └── org
- │ │ └── docs
- │ │ └── richfaces
- │ │ └── Bean.java
- │ ├── resources
- │ └── webapp
- │ ├── WEB-INF
- │ │ ├── faces-config.xml
- │ │ └── web.xml
- │ ├── index.xhtml
- │ └── pages
- │ └── index.xhtml
- └── test
- └── java
- └── org
- └── docs
- └── richfaces
- └── BeanTest.java
-</screen>
- </para>
+├── <filename>pom.xml</filename>
+└── <filename>src</filename>
+ ├── <filename>main</filename>
+ │ ├── <filename>java</filename>
+ │ │ └── <filename>org</filename>
+ │ │ └── <filename>docs</filename>
+ │ │ └── <filename>richfaces</filename>
+ │ │ └── <filename>Bean.java</filename>
+ │ ├── <filename>resources</filename>
+ │ └── <filename>webapp</filename>
+ │ ├── <filename>WEB-INF</filename>
+ │ │ ├── <filename>faces-config.xml</filename>
+ │ │ └── <filename>web.xml</filename>
+ │ ├── <filename>index.xhtml</filename>
+ │ └── <filename>pages</filename>
+ │ └── <filename>index.xhtml</filename>
+ └── <filename>test</filename>
+ └── <filename>java</filename>
+ └── <filename>org</filename>
+ └── <filename>docs</filename>
+ └── <filename>richfaces</filename>
+ └── <filename>BeanTest.java</filename></screen>
</step>
<step id="step-Developer_Guide-Using_RichFaces_with_Maven-Add_dependencies">
<title>Add dependencies</title>
<para>
- The <filename>jsf-app</filename> directory contains a project descriptor file, <filename>pom.xml</filename>. To add RichFaces libraries to your project, edit the project descriptor to add dependencies to the <sgmltag><dependencies></sgmltag> element as follows:
+ Your root directory of your project contains a project descriptor file, <filename>pom.xml</filename>. To add RichFaces libraries to your project, edit the project descriptor to add dependencies to the <sgmltag><dependencies></sgmltag> element as follows:
</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>
</step>
+
+<!--
+<remark>REMOVE ONCE 4.0 ARCHETYPE IS COMPLETE</remark>
+-->
+ <step id="step-Developer_Guide-Using_RichFaces_with_Maven-Update_the_generated_project">
+ <title>Update the generated project</title>
+ <para>
+ After the project has been generated from the old archetype, it must be updated to use RichFaces &VERSION; and JSF 2.
+ </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:
+ </para>
+<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>
Added: root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Add_dependencies.xml_sample
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Add_dependencies.xml_sample (rev 0)
+++ root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Add_dependencies.xml_sample 2010-05-13 06:01:36 UTC (rev 17012)
@@ -0,0 +1,75 @@
+<dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_12</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_12</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <!-- RichFaces libraries -->
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>3.3.3.Final</version>
+ </dependency>
+</dependencies>
Modified: root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Add_required_repositories.xml_sample
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Add_required_repositories.xml_sample 2010-05-12 22:53:13 UTC (rev 17011)
+++ root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Add_required_repositories.xml_sample 2010-05-13 06:01:36 UTC (rev 17012)
@@ -1,47 +1,38 @@
-<settings>
- ...
- <profiles>
+<profiles>
...
<profile>
- <id>jboss-public-repository</id>
- <repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+ <id>jboss-public-repository</id>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
</profile>
-
- </profiles>
-
- <activeProfiles>
- <activeProfile>jboss-public-repository</activeProfile>
- </activeProfiles>
- ...
-</settings>
+</profiles>
Added: root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Update_the_generated_project.xml_sample
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Update_the_generated_project.xml_sample (rev 0)
+++ root/docs/trunk/Developer_Guide/en-US/extras/prog-Developer_Guide-Using_RichFaces_with_Maven-Update_the_generated_project.xml_sample 2010-05-13 06:01:36 UTC (rev 17012)
@@ -0,0 +1,4 @@
+<context-param>
+ <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name>
+ <param-value>true</param-value>
+</context-param>
14 years, 5 months
JBoss Rich Faces SVN: r17011 - in root/core/trunk: api and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-12 18:53:13 -0400 (Wed, 12 May 2010)
New Revision: 17011
Added:
root/core/trunk/checkstyle-suppressions.xml
Removed:
root/core/trunk/impl/checkstyle-suppressions.xml
Modified:
root/core/trunk/api/pom.xml
root/core/trunk/impl/pom.xml
root/core/trunk/parent/pom.xml
Log:
Fix checkstyle settings for the core module
Modified: root/core/trunk/api/pom.xml
===================================================================
--- root/core/trunk/api/pom.xml 2010-05-12 22:47:44 UTC (rev 17010)
+++ root/core/trunk/api/pom.xml 2010-05-12 22:53:13 UTC (rev 17011)
@@ -86,4 +86,14 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <!-- Trigger checkstyle for this build -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Added: root/core/trunk/checkstyle-suppressions.xml
===================================================================
--- root/core/trunk/checkstyle-suppressions.xml (rev 0)
+++ root/core/trunk/checkstyle-suppressions.xml 2010-05-12 22:53:13 UTC (rev 17011)
@@ -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>
Deleted: root/core/trunk/impl/checkstyle-suppressions.xml
===================================================================
--- root/core/trunk/impl/checkstyle-suppressions.xml 2010-05-12 22:47:44 UTC (rev 17010)
+++ root/core/trunk/impl/checkstyle-suppressions.xml 2010-05-12 22:53:13 UTC (rev 17011)
@@ -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>
Modified: root/core/trunk/impl/pom.xml
===================================================================
--- root/core/trunk/impl/pom.xml 2010-05-12 22:47:44 UTC (rev 17010)
+++ root/core/trunk/impl/pom.xml 2010-05-12 22:53:13 UTC (rev 17011)
@@ -141,9 +141,20 @@
<directory>target/javascript</directory>
</resource>
</resources>
-
+
<plugins>
+ <!-- Trigger checkstyle for this build -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+
+ <!--
+ TODO Centralize this because calendar and context menu
+ use this too
+ -->
+ <!-- Note: This may be removed by redisgn -->
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<executions>
@@ -154,9 +165,29 @@
</execution>
</executions>
</plugin>
-
- <!-- The following plugins are specific to impl, and create, process, and document JavaScript resources -->
+
+ <!--
+ TODO should be in profile not here. The path in profile
+ is correct
+ -->
<plugin>
+ <!-- Configure js documentation plugin -->
+ <groupId>gr.abiss.mvn.plugins</groupId>
+ <artifactId>maven-jstools-plugin</artifactId>
+ <configuration>
+ <jsDir>${basedir}/src/main/resources/Meta-inf/resources</jsDir>
+ <includes>**/*.js</includes>
+ <caseSensitive>true</caseSensitive>
+ </configuration>
+ </plugin>
+
+ <!--
+ The following 2 plugins are specific to impl, and
+ create, process, and document JavaScript resources NOTE:
+ these are legacy and they and the resources they
+ reference can be removed
+ -->
+ <plugin>
<!-- Configure ant scripts to generate javascript -->
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -243,16 +274,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <!-- Configure js documentation plugin -->
- <groupId>gr.abiss.mvn.plugins</groupId>
- <artifactId>maven-jstools-plugin</artifactId>
- <configuration>
- <jsDir>${basedir}/src/main/resources/Meta-inf/resources</jsDir>
- <includes>**/*.js</includes>
- <caseSensitive>true</caseSensitive>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -280,7 +301,12 @@
</executions>
</plugin>
<plugin>
- <!-- Configure JavaScript Doc Tool -->
+ <!--
+ TODO - this can go to central, but should
+ check settings. This is also related to docs
+ so perhaps add to a doc profile Configure
+ JavaScript Doc Tool
+ -->
<groupId>gr.abiss.mvn.plugins</groupId>
<artifactId>maven-jstools-plugin</artifactId>
<executions>
Modified: root/core/trunk/parent/pom.xml
===================================================================
--- root/core/trunk/parent/pom.xml 2010-05-12 22:47:44 UTC (rev 17010)
+++ root/core/trunk/parent/pom.xml 2010-05-12 22:53:13 UTC (rev 17011)
@@ -38,6 +38,7 @@
<properties>
<richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version>
+ <richfaces.checkstyle.version>4.0.0-SNAPSHOT</richfaces.checkstyle.version>
</properties>
<dependencyManagement>
@@ -78,4 +79,27 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <!-- Configure checkstyle plugin for commons -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${richfaces.checkstyle.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
+ <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
14 years, 5 months
JBoss Rich Faces SVN: r17010 - root/core/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-12 18:47:44 -0400 (Wed, 12 May 2010)
New Revision: 17010
Removed:
root/core/trunk/version-matrix/
Log:
Removed unneeded version-matrix from core module
14 years, 5 months
JBoss Rich Faces SVN: r17009 - root/core/trunk/api/src/main/java/org/ajax4jsf/javascript.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-12 18:46:03 -0400 (Wed, 12 May 2010)
New Revision: 17009
Modified:
root/core/trunk/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java
Log:
Fixed 2 checkstyle errors
Modified: root/core/trunk/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java
===================================================================
--- root/core/trunk/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java 2010-05-12 22:24:11 UTC (rev 17008)
+++ root/core/trunk/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java 2010-05-12 22:46:03 UTC (rev 17009)
@@ -341,12 +341,13 @@
return false;
} else if (attributeVal.toString().length() == 0) {
return false;
- } else
+ } else {
return isValidProperty(attributeVal);
+ }
}
public static boolean shouldRenderAttribute(String attributeName, Object attributeVal) {
- return shouldRenderAttribute(attributeVal);
+ return shouldRenderAttribute(attributeVal);
}
/**
14 years, 5 months
JBoss Rich Faces SVN: r17008 - in root: commons/trunk/parent and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-12 18:24:11 -0400 (Wed, 12 May 2010)
New Revision: 17008
Modified:
root/build/parent/trunk/pom.xml
root/commons/trunk/parent/pom.xml
Log:
Updated checkstyle configuration to find the correct files.
Modified: root/build/parent/trunk/pom.xml
===================================================================
--- root/build/parent/trunk/pom.xml 2010-05-12 18:25:39 UTC (rev 17007)
+++ root/build/parent/trunk/pom.xml 2010-05-12 22:24:11 UTC (rev 17008)
@@ -128,6 +128,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.3</version>
+ <executions>
+ <execution>
+ <id>richfaces-checkstyle-report</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<skip>${skipCheckstyle}</skip>
</configuration>
Modified: root/commons/trunk/parent/pom.xml
===================================================================
--- root/commons/trunk/parent/pom.xml 2010-05-12 18:25:39 UTC (rev 17007)
+++ root/commons/trunk/parent/pom.xml 2010-05-12 22:24:11 UTC (rev 17008)
@@ -85,21 +85,10 @@
<version>${richfaces.checkstyle.version}</version>
</dependency>
</dependencies>
- <executions>
- <execution>
- <id>richfaces-checkstyle-report</id>
- <configuration>
- <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml
- </configLocation>
- <suppressionsLocation>checkstyle-suppressions.xml
- </suppressionsLocation>
- </configuration>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
+ <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
14 years, 5 months
JBoss Rich Faces SVN: r17007 - root/build/parent/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-12 14:25:39 -0400 (Wed, 12 May 2010)
New Revision: 17007
Modified:
root/build/parent/trunk/pom.xml
Log:
Minor update for a property name change to skip checkstyle
Modified: root/build/parent/trunk/pom.xml
===================================================================
--- root/build/parent/trunk/pom.xml 2010-05-12 18:21:59 UTC (rev 17006)
+++ root/build/parent/trunk/pom.xml 2010-05-12 18:25:39 UTC (rev 17007)
@@ -129,7 +129,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.3</version>
<configuration>
- <skip>${skipch}</skip>
+ <skip>${skipCheckstyle}</skip>
</configuration>
</plugin>
<plugin>
14 years, 5 months