JBoss Rich Faces SVN: r16107 - root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-12-10 20:42:53 -0500 (Thu, 10 Dec 2009)
New Revision: 16107
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java
Log:
refactor model
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-12-10 16:48:10 UTC (rev 16106)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-12-11 01:42:53 UTC (rev 16107)
@@ -31,6 +31,7 @@
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.DirectoryScanner;
import org.richfaces.builder.maven.MavenLogger;
+import org.richfaces.cdk.CdkClassLoader;
import org.richfaces.cdk.CdkContextBase;
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.CdkWorker;
@@ -226,14 +227,14 @@
if (null != workers) {
for (Entry<String, String> workerEntry : workers.entrySet()) {
try {
- Class<? extends CdkWorker> workerClass =
- Class.forName(workerEntry.getKey()).asSubclass(CdkWorker.class);
+ Class<CdkWorker> workerClass =
+ (Class<CdkWorker>) Class.forName(workerEntry.getKey()).asSubclass(CdkWorker.class);
Class<? extends CdkWorker> workerImplementationClass =
Class.forName(workerEntry.getValue()).asSubclass(CdkWorker.class);
CdkWorker workerInstance = workerImplementationClass.newInstance();
workerInstance.init(context);
- context.addWorker(workerClass, workerInstance);
+ context.setWorker(workerClass, workerInstance);
if (NamingConventions.class.equals(workerClass)) {
namingConventionsConfigured = true;
@@ -264,7 +265,7 @@
throw new MojoFailureException("Naming conventions initialization error", e);
}
- context.addWorker(NamingConventions.class, facesConventions);
+ context.setWorker(NamingConventions.class, facesConventions);
}
// Set default model validator if it was not configured.
@@ -277,7 +278,7 @@
throw new MojoFailureException("RichFaces Validator initialization error", e);
}
- context.addWorker(ModelValidator.class, validatorImpl);
+ context.setWorker(ModelValidator.class, validatorImpl);
}
if (null != options) {
@@ -290,10 +291,8 @@
// Build JSF library.
LibraryBuilder builder = LibraryBuilder.createInstance(context);
- ComponentLibrary model = builder.buildModel();
+ builder.build();
- builder.generate(model);
-
// Tell project about generated files.
project.addCompileSourceRoot(outputJavaDirectory.getAbsolutePath());
@@ -393,23 +392,21 @@
return doScan(facesConfigs);
}
- protected ClassLoader createProjectClassLoader(MavenProject project) {
- ClassLoader classLoader = null;
+ protected CdkClassLoader createProjectClassLoader(MavenProject project) {
+ CdkClassLoader classLoader = null;
try {
String outputDirectory = project.getBuild().getOutputDirectory();
- URL[] urls = new URL[classpathElements.size() + 1];
- int i = 0;
+ List<File> urls = new ArrayList<File>(classpathElements.size() + 1);
+ urls.add(new File(outputDirectory));
- urls[i++] = new File(outputDirectory).toURI().toURL();
-
for (Iterator<String> iter = classpathElements.iterator(); iter.hasNext();) {
String element = iter.next();
- urls[i++] = new File(element).toURI().toURL();
+ urls.add(new File(element));
}
- classLoader = new URLClassLoader(urls);
+ classLoader = new CdkClassLoader(urls);
} catch (MalformedURLException e) {
getLog().error("Bad URL in classpath", e);
}
14 years, 5 months
JBoss Rich Faces SVN: r16106 - in branches/community/3.3.X: samples/richfaces-demo and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-12-10 11:48:10 -0500 (Thu, 10 Dec 2009)
New Revision: 16106
Modified:
branches/community/3.3.X/deployRelease.sh
branches/community/3.3.X/samples/richfaces-demo/pom.xml
Log:
RFPL-291
Modified: branches/community/3.3.X/deployRelease.sh
===================================================================
--- branches/community/3.3.X/deployRelease.sh 2009-12-10 14:27:38 UTC (rev 16105)
+++ branches/community/3.3.X/deployRelease.sh 2009-12-10 16:48:10 UTC (rev 16106)
@@ -35,7 +35,7 @@
cd $PROJECT_DIR/samples/violetRays
mvn -s $settings -P local,docs,release clean deploy
cd $PROJECT_DIR/samples/richfaces-demo
-mvn -s $settings -P local,docs,release clean deploy
+mvn -s $settings -P local,docs,release,jsf1_2 clean deploy
cd $PROJECT_DIR/samples/richfaces-demo
mvn -s $settings -P local,docs,release,jsf2_0 clean deploy
cd $PROJECT_DIR/examples/photoalbum
Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-12-10 14:27:38 UTC (rev 16105)
+++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-12-10 16:48:10 UTC (rev 16106)
@@ -184,7 +184,7 @@
<version>2.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.2_12</version>
@@ -194,7 +194,7 @@
<artifactId>jsf-impl</artifactId>
<version>1.2_12</version>
<scope>runtime</scope>
- </dependency>
+ </dependency-->
</dependencies>
</profile>
<profile>
14 years, 5 months
JBoss Rich Faces SVN: r16105 - in root/ui-sandbox/trunk/components/tables/ui/src/main: resources/META-INF/resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-12-10 09:27:38 -0500 (Thu, 10 Dec 2009)
New Revision: 16105
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java
root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js
Log:
change toggle control client script
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2009-12-10 11:23:56 UTC (rev 16104)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2009-12-10 14:27:38 UTC (rev 16105)
@@ -24,16 +24,17 @@
* @author Anton Belevich
*
*/
-@ResourceDependencies( { @ResourceDependency(name = "toggler.js") })
+@ResourceDependencies( {@ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"),
+ @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "toggler.js")})
public abstract class ToggleControlRendererBase extends RendererBase {
- private static final String MANAGER_SCRIPT = "ToggleManager.add(new Toggle(''{0}'', {1}));";
+ private static final String MANAGER_SCRIPT = "RichFaces.ui.ToggleManager.addToggler(new RichFaces.ui.Toggle(''{0}'', {1}));";
- private static final String CLIENT_TOGGLE_SCRIPT = "ToggleManager.clientToggle(''{0}'', {1});";
+ private static final String CLIENT_TOGGLE_SCRIPT = "RichFaces.ui.ToggleManager.clientToggle(''{0}'', {1});";
- private static final String SERVER_TOGGLE_SCRIPT = "ToggleManager.serverToggle(''{0}'', {1});";
+ private static final String SERVER_TOGGLE_SCRIPT = "RichFaces.ui.ToggleManager.serverToggle(''{0}'', {1});";
- private static final String AJAX_TOGGLE_SCRIPT = "ToggleManager.ajaxToggle(''{0}'', {1});";
+ private static final String AJAX_TOGGLE_SCRIPT = "RichFaces.ui.ToggleManager.ajaxToggle(''{0}'', {1});";
private static final String DISPLAY_NONE = "display: none;";
@@ -82,11 +83,6 @@
String toggleId = toggleControl.getClientId(context);
String options = encodeOptions(context, toggleControl, subTable);
- writer.startElement(HTML.SCRIPT_ELEM, subTable);
- String registerScript = MessageFormat.format(MANAGER_SCRIPT, toggleId, options);
- writer.writeText(registerScript, null);
- writer.endElement(HTML.SCRIPT_ELEM);
-
String switchType = subTable.getSwichType();
boolean expanded = subTable.isExpanded();
@@ -95,6 +91,10 @@
encodeHiddenInput(context, writer, toggleControl);
+ writer.startElement(HTML.SCRIPT_ELEM, subTable);
+ String registerScript = MessageFormat.format(MANAGER_SCRIPT, toggleId, options);
+ writer.writeText(registerScript, null);
+ writer.endElement(HTML.SCRIPT_ELEM);
}
}
}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js 2009-12-10 11:23:56 UTC (rev 16104)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js 2009-12-10 14:27:38 UTC (rev 16105)
@@ -1,104 +1,128 @@
-function Toggle(id, options){
- this.id = id;
- this.forId = options.forId;
- this.state = options.initialState;
- this.formId = options.formId;
- this.hidden = id + ":hidden";
- this.expandControl = this.id + ":expand";
- this.collapseControl = this.id + ":collapse";
-}
-
-Toggle.prototype.convertId = function(id) {
- return id.replace(/:/g, "\\:");
-}
-
-Toggle.prototype.toggle = function(toState) {
- var elements = this.getElement(this.forId);
-
- if(this.state != toState) {
-
- this.toggleControls(toState);
-
- if(toState) {
- this.command("show", elements);
- } else {
- this.command("hide", elements);
- }
-
- this.state = toState;
- this.saveState(this.state);
- }
-}
-
-Toggle.prototype.toggleControls = function(toState) {
-
- var hideControlId = toState ? this.expandControl : this.collapseControl;
- var showControlId = this.state ? this.expandControl : this.collapseControl;
+(function(jQuery, richfaces) {
- var hideElement = this.getElement(hideControlId);
- var showElement = this.getElement(showControlId);
+ richfaces.ui = richfaces.ui || {};
+
+ richfaces.ui.ToggleManager = {};
- this.command("show", showElement);
- this.command("hide", hideElement);
-}
+ (function(manager){
+ var togglers = {};
+
+ manager['addToggler'] = function(toggler) {
+ if(toggler) {
+ togglers[toggler.id] = toggler;
+ }
+ };
+
+ manager['clientToggle'] = function(id, toState) {
+ if(id) {
+ togglers[id].clientToggle(toState);
+ }
+ };
+
+ manager['serverToggle'] = function(id, toState) {
+ if(id) {
+ togglers[id].serverToggle(toState);
+ }
+ };
+
+ manager['ajaxToggle'] = function(id, toState) {
+ if(id) {
+ togglers[id].ajaxToggle(toState);
+ }
+ };
+
+ manager['clearTogglers'] = function() {
+ togglers = {};
+ };
+
+ manager['getTogglers'] = function () {
+ return togglers;
+ };
+
+ })(richfaces.ui.ToggleManager);
+
+})(jQuery, window.RichFaces);
-Toggle.prototype.saveState= function(state) {
- var id = this.hidden;
- var element = this.getElement(id);
- if(element) {
- element.attr('value', state);
- }
-}
-Toggle.prototype.clientToggle= function(expand){
- this.toggle(expand);
-}
-
-Toggle.prototype.serverToggle = function(expand) {
- this.saveState(expand);
- var form = this.getElement(this.formId);
- form.submit();
-}
-
-Toggle.prototype.ajaxToggle = function(expand) {
-}
-
-Toggle.prototype.command = function(name, element){
- if(name) {
- if(element && typeof element[name] == 'function') {
- element[name]();
- }
- }
-}
-
-Toggle.prototype.getElement = function(id) {
- return $("#" + this.convertId(id));
-}
-
-ToggleManager = new Object();
-
-ToggleManager.process = {};
-
-ToggleManager.add = function (toggler){
- if(toggler) {
- this.process[toggler.id] = toggler;
- }
-}
-
-ToggleManager.clientToggle = function(id, expand) {
- if(id) {
- this.process[id].clientToggle(expand);
- }
-}
-
-ToggleManager.serverToggle = function(id, expand) {
- if(id) {
- this.process[id].serverToggle(expand);
- }
-}
-
-ToggleManager.ajaxToggle = function(id, expand) {
- if(id) {
- this.process[id].ajaxToggle(expand);
- }
-}
+(function (jQuery, richfaces) {
+
+ richfaces.ui = richfaces.ui || {};
+
+ richfaces.ui.Toggle = function(id, options) {
+ this.getElement(id).rich= {component: this};
+ this.id = id;
+ this.hiddenInput = this.getElement(id + ":hidden");
+ this.expandControl = this.getElement(id + ":expand");
+ this.collapseControl = this.getElement(id + ":collapse");
+ this.form = this.getElement(options.formId);
+ this.forId = options.forId;
+
+ this.state = options.initialState;
+ };
+
+ jQuery.extend(richfaces.ui.Toggle.prototype, ( function () {
+
+ var convertId = function (id){
+ return id.replace(/:/g, "\\:");
+ };
+
+ return {
+ getElement : function (id) {
+ return $("#" + convertId(id));
+ },
+
+ saveState : function(state) {
+ if(this.hiddenInput) {
+ this.hiddenInput.attr('value', state);
+ }
+ },
+
+ toggle: function (toState) {
+ var element = this.getElement(this.forId);
+ if(this.state != toState) {
+ this.toggleControls(toState);
+
+ if(toState) {
+ this.command("show", element);
+ } else {
+ this.command("hide", element);
+ }
+
+ this.state = toState;
+ this.saveState(this.state);
+ }
+ },
+
+ toggleControls: function (toState){
+ var hideControl = toState ? this.expandControl : this.collapseControl;
+ var showControl = this.state ? this.expandControl : this.collapseControl;
+ this.command("show", showControl);
+ this.command("hide", hideControl);
+ },
+
+ clientToggle: function(expand){
+ this.toggle(expand);
+ },
+
+ serverToggle: function(expand){
+ this.saveState(expand);
+ if(this.form) {
+ this.form.submit();
+ }
+ },
+
+ ajaxToggle: function(expand){
+ },
+
+ command: function(name, element){
+ if(name) {
+ if(element && typeof element[name] == 'function') {
+ element[name]();
+ }
+ }
+ }
+
+ };
+
+ })());
+})(jQuery, window.RichFaces);
\ No newline at end of file
14 years, 5 months
JBoss Rich Faces SVN: r16104 - branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/style.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2009-12-10 06:23:56 -0500 (Thu, 10 Dec 2009)
New Revision: 16104
Modified:
branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/style/StyleTestCase.java
Log:
* StyleTestCase - use ColorUtils.convertToAWTColor to compare background-colors
Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/style/StyleTestCase.java
===================================================================
--- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/style/StyleTestCase.java 2009-12-10 11:12:18 UTC (rev 16103)
+++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/style/StyleTestCase.java 2009-12-10 11:23:56 UTC (rev 16104)
@@ -21,12 +21,14 @@
*******************************************************************************/
package org.jboss.richfaces.integrationTest.style;
+import java.awt.Color;
import java.util.LinkedHashMap;
import java.util.Map;
import static org.testng.Assert.*;
import org.jboss.richfaces.integrationTest.AbstractSeleniumRichfacesTestCase;
+import org.jboss.test.selenium.utils.ColorUtils;
import org.jboss.test.selenium.waiting.Wait;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -69,8 +71,10 @@
selenium.waitForPageToLoad(Long.toString(Wait.DEFAULT_TIMEOUT));
scrollIntoView(LOC_FIELDSET_HEADER, true);
- assertEquals(msgColor, getStyle(LOC_PANEL, "background-color"), format(
- "background-color for '{0}' skin does not match", selenium.getText(locLink)));
+ Color expected = ColorUtils.convertToAWTColor(msgColor);
+ Color actual = ColorUtils.convertToAWTColor(getStyle(LOC_PANEL, "background-color"));
+ assertEquals(actual, expected, format("background-color for '{0}' skin does not match", selenium
+ .getText(locLink)));
}
}
14 years, 5 months
JBoss Rich Faces SVN: r16103 - branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/separator.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2009-12-10 06:12:18 -0500 (Thu, 10 Dec 2009)
New Revision: 16103
Modified:
branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java
Log:
* SeparatorTestCase
- follow CSS url syntax - url("http://...")
- getStyle(locator, "width") fixed to getElementWidth(locator)
Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java
===================================================================
--- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java 2009-12-10 01:41:55 UTC (rev 16102)
+++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java 2009-12-10 11:12:18 UTC (rev 16103)
@@ -23,9 +23,12 @@
package org.jboss.richfaces.integrationTest.separator;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.jboss.richfaces.integrationTest.AbstractSeleniumRichfacesTestCase;
import org.jboss.test.selenium.utils.URLUtils;
@@ -80,10 +83,10 @@
String text = getStyle(format(LOC_SEPARATOR_N, 1), "height");
assertEquals(text, MSG_SECOND_HEIGHT, "Height of the separator.");
- double widthFull = Double.parseDouble(getStyle(format(LOC_SEPARATOR_N, 0), "width").replace("px", ""));
- double width75 = Double.parseDouble(getStyle(format(LOC_SEPARATOR_N, 1), "width").replace("px", ""));
+ long widthFull = selenium.getElementWidth(format(LOC_SEPARATOR_N, 0)).longValue();
+ long width75 = selenium.getElementWidth(format(LOC_SEPARATOR_N, 1)).longValue();
- assertEquals(width75, widthFull * 0.75, "Width of the separator.");
+ assertTrue(Math.abs(width75 - widthFull * 0.75) < 1, "Width of the second separator isn't 75% of first");
text = getSeparatorHash(format(LOC_SEPARATOR_N, 1));
assertEquals(text, MSG_SECOND_HASH, "Hash code of the image that makes the separator.");
@@ -167,7 +170,12 @@
private String getSeparatorHash(String locator) {
// create URL of the image
String url = getStyle(locator, "background-image");
- url = url.replace("url(", "").replace(")", "");
+ Matcher matcher = Pattern.compile("url\\(\"?([^\"\\)]+)\"?\\)").matcher(url);
+ if (matcher.matches()) {
+ url = matcher.group(1);
+ } else {
+ fail("Url '" + url + "' doesn't match url pattern");
+ }
String hash = null;
try {
14 years, 5 months
JBoss Rich Faces SVN: r16102 - branches/community/3.3.X/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2009-12-09 20:41:55 -0500 (Wed, 09 Dec 2009)
New Revision: 16102
Modified:
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_calendar.xml
Log:
Corrected rich_calender as per Jira RF-8199
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_calendar.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_calendar.xml 2009-12-09 20:31:31 UTC (rev 16101)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_calendar.xml 2009-12-10 01:41:55 UTC (rev 16102)
@@ -13,7 +13,7 @@
<para>
The <emphasis role="bold">
<property><rich:calendar></property>
- </emphasis> component is used to create inputs for date and time and enter them inline or using pup-up calendar that allows to navigate through monthes and years.
+ </emphasis> component is used to create inputs for date and time and enter them inline or using pup-up calendar that allows to navigate through months and years.
</para>
<figure>
<title>
@@ -264,48 +264,28 @@
</mediaobject>
</figure>
-
-
-
<para>
- <emphasis>
- <property>"ondateselect"</property>
+ The <emphasis><property>"onchanged"</property>
</emphasis> attribute is used to define an event that is triggered
- before date selection.</para>
- <para>
- <emphasis>
- The <property>"ondateselected"</property>
- </emphasis> attribute is used to define an event that is triggered
- after date selection. </para>
- <para>For example, to fire some event after date selection you should use
- <emphasis role="bold">
- <property><a4j:support></property>
- </emphasis>. And it should be bound to <emphasis>
- <property>"ondateselected"</property>
- </emphasis> event as it's shown in the example below:</para>
+ from date selection, as shown in the example below:</para>
<programlisting role="XML"><![CDATA[...
<rich:calendar id="date" value="#{bean.dateTest}">
- <a4j:support event="ondateselected" reRender="mainTable"/>
+ <a4j:support event="onchanged" reRender="mainTable"/>
</rich:calendar>
...]]></programlisting>
- <note>
- <title>Note:</title>
- <para>
- When a timePicker was fulfilled, the <emphasis>
- <property>"ondateselected"</property>
- </emphasis> attribute does not allow you to submit a selected date. It happens because this event rose when the date is selected but the input hasn't been updated with new value yet.
-
- </para>
- </note>
<para>
- <emphasis>
- <property>"ondateselect"</property>
- </emphasis> could be used for possibility of date selection canceling.
+ The <emphasis><property>"ondateselect"</property>
+ </emphasis> attribute is used to define an event that is triggered
+ before date selection. It could be used for possibility of date selection canceling.
See an example below:</para>
<programlisting role="XML"><![CDATA[...
<rich:calendar id="date" value="#{bean.dateTest}" ondateselect="if (!confirm('Are you sure to change date?')){return false;}"/>
...]]></programlisting>
<para>
+ The <emphasis><property>"ondateselected"</property>
+ </emphasis> attribute is used to define an event that is triggered
+ after date selection. </para>
+ <para>
<emphasis>
<property>"oncurrentdateselected"</property>
</emphasis> event is fired when the "next/previous month" or
14 years, 5 months
JBoss Rich Faces SVN: r16101 - branches/community/3.3.X.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-12-09 15:31:31 -0500 (Wed, 09 Dec 2009)
New Revision: 16101
Modified:
branches/community/3.3.X/deployRelease.sh
Log:
RFPL-291
Modified: branches/community/3.3.X/deployRelease.sh
===================================================================
--- branches/community/3.3.X/deployRelease.sh 2009-12-09 19:58:49 UTC (rev 16100)
+++ branches/community/3.3.X/deployRelease.sh 2009-12-09 20:31:31 UTC (rev 16101)
@@ -36,8 +36,8 @@
mvn -s $settings -P local,docs,release clean deploy
cd $PROJECT_DIR/samples/richfaces-demo
mvn -s $settings -P local,docs,release clean deploy
-cd $PROJECT_DIR/samples/richfaces-demo,jsf2_0
-mvn -s $settings -P local,docs,release clean deploy
+cd $PROJECT_DIR/samples/richfaces-demo
+mvn -s $settings -P local,docs,release,jsf2_0 clean deploy
cd $PROJECT_DIR/examples/photoalbum
mvn -s $settings -P local,docs,release clean deploy
cd $PROJECT_DIR/examples/photoalbum/assembly
14 years, 5 months
JBoss Rich Faces SVN: r16100 - in branches/community/3.3.X: ui/dataTable/src/main/java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-12-09 14:58:49 -0500 (Wed, 09 Dec 2009)
New Revision: 16100
Added:
branches/community/3.3.X/samples/dataTableDemo/src/main/webapp/pages/RF-8192.jsp
Modified:
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
RF-8192 - dataTables: change default header facet for sorting generation
the only thing I did -- I have reverted prev fix
If need more please let me know
Added: branches/community/3.3.X/samples/dataTableDemo/src/main/webapp/pages/RF-8192.jsp
===================================================================
--- branches/community/3.3.X/samples/dataTableDemo/src/main/webapp/pages/RF-8192.jsp (rev 0)
+++ branches/community/3.3.X/samples/dataTableDemo/src/main/webapp/pages/RF-8192.jsp 2009-12-09 19:58:49 UTC (rev 16100)
@@ -0,0 +1,28 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/dataTable" prefix="data" %>
+<html>
+<head>
+ <title></title>
+ <style>
+ .dataTable .rich-sort-icon {
+ display: none;
+ }
+ </style>
+</head>
+<body>
+<f:view>
+ <a4j:form>
+ <data:dataTable value="#{data.mounths}" var="entry">
+ <data:column selfSorted="false" sortBy="#{entry.mounth}" sortOrder="DESCENDING">
+ <h:outputText value="#{entry.mounth}"/>
+ </data:column>
+ <data:column>
+ <h:outputText value="#{entry.total}"/>
+ </data:column>
+ </data:dataTable>
+ </a4j:form>
+</f:view>
+</body>
+</html>
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-12-09 19:43:09 UTC (rev 16099)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-12-09 19:58:49 UTC (rev 16100)
@@ -169,8 +169,8 @@
UIComponent header = table.getHeader();
boolean isEncodeHeaders = isColumnFacetPresent(table, "header") ||
- isHeaderFactoryColumnAttributePresent(table, "sortBy") ||
- isHeaderFactoryColumnAttributePresent(table, "comparator") ||
+// isHeaderFactoryColumnAttributePresent(table, "sortBy") ||
+// isHeaderFactoryColumnAttributePresent(table, "comparator") ||
isHeaderFactoryColumnAttributePresent(table, "filterBy");
if (header != null || isEncodeHeaders) {
@@ -457,7 +457,6 @@
/**
* Calculate total number of columns in table.
*
- * @param context
* @param table
* @return
*/
14 years, 5 months
JBoss Rich Faces SVN: r16099 - in branches/community/3.3.X: samples/richfaces-demo and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-12-09 14:43:09 -0500 (Wed, 09 Dec 2009)
New Revision: 16099
Modified:
branches/community/3.3.X/deployRelease.sh
branches/community/3.3.X/samples/richfaces-demo/pom.xml
Log:
RFPL-291
Modified: branches/community/3.3.X/deployRelease.sh
===================================================================
--- branches/community/3.3.X/deployRelease.sh 2009-12-09 18:15:30 UTC (rev 16098)
+++ branches/community/3.3.X/deployRelease.sh 2009-12-09 19:43:09 UTC (rev 16099)
@@ -36,6 +36,8 @@
mvn -s $settings -P local,docs,release clean deploy
cd $PROJECT_DIR/samples/richfaces-demo
mvn -s $settings -P local,docs,release clean deploy
+cd $PROJECT_DIR/samples/richfaces-demo,jsf2_0
+mvn -s $settings -P local,docs,release clean deploy
cd $PROJECT_DIR/examples/photoalbum
mvn -s $settings -P local,docs,release clean deploy
cd $PROJECT_DIR/examples/photoalbum/assembly
Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-12-09 18:15:30 UTC (rev 16098)
+++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-12-09 19:43:09 UTC (rev 16099)
@@ -32,7 +32,7 @@
</repositories>
<build>
- <finalName>richfaces-demo</finalName>
+ <finalName>${classifiedArtifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
14 years, 5 months
JBoss Rich Faces SVN: r16098 - in branches/community/3.3.X/samples/richfaces-demo/functional-test: src/test/java/org/jboss/richfaces/integrationTest and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2009-12-09 13:15:30 -0500 (Wed, 09 Dec 2009)
New Revision: 16098
Modified:
branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml
branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java
Log:
- added demo.location parameter to point on the specific binary
- added installation details for AS 6.0.0.M1 container into profiles.jboss-qa.xml (RF-8190)
- added parameter selenium.debug to turn on selenium's debug and browserSideLog options optionally
- added parameter selenium.maximize to to turn on maximizing and focusing tested windows before the actual test begins (RF-8188)
- added repository.exadel.com to profiles.jboss-qa.xml (RF-8189)
Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-12-08 14:42:15 UTC (rev 16097)
+++ branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-12-09 18:15:30 UTC (rev 16098)
@@ -7,7 +7,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.richfaces.integrationTest</groupId>
- <artifactId>selenium-test</artifactId>
+ <artifactId>functional-test</artifactId>
<packaging>jar</packaging>
<name>selenium-test</name>
<url>http://maven.apache.org</url>
@@ -33,7 +33,7 @@
</snapshots>
</repository>
<repository>
- <id>openqa</id>
+ <id>archiva.openqa.org</id>
<name>OpenQA Repository</name>
<url>http://archiva.openqa.org/repository/releases</url>
<layout>default</layout>
@@ -61,6 +61,7 @@
<properties>
<demo.artifactId.suffix />
<demo.version>${project.version}</demo.version>
+ <demo.location></demo.location>
<resources.dir>${project.build.directory}/test-classes</resources.dir>
<extensions.dir>${resources.dir}/user-extensions</extensions.dir>
<browser></browser>
@@ -69,10 +70,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<selenium.host>localhost</selenium.host>
<selenium.port>8444</selenium.port>
+ <selenium.debug>false</selenium.debug>
+ <selenium.maximize>false</selenium.maximize>
<firefoxProfileTemplate></firefoxProfileTemplate>
</properties>
<build>
- <finalName>seleniumTest</finalName>
+ <finalName>${project.artifactId}</finalName>
<testResources>
<testResource>
<directory>src/test/resources</directory>
@@ -193,12 +196,12 @@
</goals>
<configuration>
<background>true</background>
- <debug>false</debug>
<port>${selenium.port}</port>
<userExtensions>${resources.dir}/custom-extensions.js</userExtensions>
<logOutput>true</logOutput>
- <browserSideLog>true</browserSideLog>
- <debug>true</debug>
+ <logFile>${project.build.directory}/selenium/selenium-server.log</logFile>
+ <browserSideLog>${selenium.debug}</browserSideLog>
+ <debug>${selenium.debug}</debug>
</configuration>
</execution>
</executions>
@@ -219,7 +222,7 @@
<suiteXmlFiles>
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
</suiteXmlFiles>
- <argLine>-Dbrowser='${browser}' -Dcontext.root='${context.root}' -Dcontext.path='${context.path}' -Dselenium.host='${selenium.host}' -Dselenium.port='${selenium.port}' -Dmaven.resources.dir='${resources.dir}' -Dmaven.project.build.directory='${project.build.directory}'</argLine>
+ <argLine>-Dbrowser='${browser}' -Dcontext.root='${context.root}' -Dcontext.path='${context.path}' -Dselenium.host='${selenium.host}' -Dselenium.port='${selenium.port}' -Dselenium.debug='${selenium.debug}' -Dselenium.maximize='${selenium.maximize}' -Dmaven.resources.dir='${resources.dir}' -Dmaven.project.build.directory='${project.build.directory}'</argLine>
<firefoxProfileTemplate>${firefoxProfileTemplate}</firefoxProfileTemplate>
<properties>
<property>
@@ -303,6 +306,7 @@
<groupId>org.richfaces.samples</groupId>
<artifactId>richfaces-demo${demo.artifactId.suffix}</artifactId>
<type>war</type>
+ <location>${demo.location}</location>
<properties>
<context>${context.path}</context>
</properties>
@@ -314,7 +318,7 @@
</plugins>
</build>
</profile>
- <!-- Container-type specifics: JBoss AS 5.X -->
+ <!-- Container: JBoss AS 5.X -->
<profile>
<id>container-jboss5x</id>
<activation>
Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml 2009-12-08 14:42:15 UTC (rev 16097)
+++ branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml 2009-12-09 18:15:30 UTC (rev 16098)
@@ -2,6 +2,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+ <activeProfiles>
+ <activeProfile>container-installation</activeProfile>
+ </activeProfiles>
+
<profiles>
<!-- This is used by JBoss RichFaces QA -->
<profile>
@@ -28,6 +33,17 @@
<demo.version>${profile.demo.version}</demo.version>
</properties>
</profile>
+ <profile>
+ <id>demo-found-in-workspace</id>
+ <activation>
+ <file>
+ <exists>richfaces-demo.war</exists>
+ </file>
+ </activation>
+ <properties>
+ <demo.location>./richfaces-demo.war</demo.location>
+ </properties>
+ </profile>
<!-- INTERNET EXPLORER PROFILE -->
<profile>
<id>browser-internet-explorer</id>
@@ -109,7 +125,27 @@
<browser.firefox>*firefox ${firefoxes.home}\firefox-${browser.version}\firefox.exe</browser.firefox>
</properties>
</profile>
+ <!-- CONTAINER INSTALLATION -->
<profile>
+ <id>container-installation</id>
+ <properties>
+ <jboss5x.version>5.1.0.GA</jboss5x.version>
+ <jboss5x.installer.url.unix>file:/qa/tools/src/jboss/jboss-5.1.0.GA.zip</jboss5x.installer.url.unix>
+ <jboss5x.installer.url.windows>file:t:\src\jboss\jboss-5.1.0.GA.zip</jboss5x.installer.url.windows>
+ <tomcat6x.version>6.0.18</tomcat6x.version>
+ <tomcat6x.installer.url.unix>file:/qa/tools/src/apache/apache-tomcat-6.0.18.zip</tomcat6x.installer.url.unix>
+ <tomcat6x.installer.url.windows>file:t:\src\apache\apache-tomcat-6.0.18.zip</tomcat6x.installer.url.windows>
+ </properties>
+ </profile>
+ <profile>
+ <id>container-installation-jsf2</id>
+ <properties>
+ <jboss5x.version>6.0.0.M1</jboss5x.version>
+ <jboss5x.installer.url.unix>file:/qa/home/lfryc/jboss-jsf2/jboss-5.1.0.GA.zip</jboss5x.installer.url.unix>
+ <jboss5x.installer.url.windows>file:h:\lfryc\jboss-jsf2\jboss-6.0.0.M1.zip</jboss5x.installer.url.windows>
+ </properties>
+ </profile>
+ <profile>
<id>container-tomcat6x-installation</id>
<activation>
<property>
@@ -118,9 +154,9 @@
</property>
</activation>
<properties>
- <container.version>6.0.18</container.version>
- <container.installer.url.unix>file:/qa/tools/src/apache/apache-tomcat-6.0.18.zip</container.installer.url.unix>
- <container.installer.url.windows>file:t:\src\apache\apache-tomcat-6.0.18.zip</container.installer.url.windows>
+ <container.version>${tomcat6x.version}</container.version>
+ <container.installer.url.unix>${tomcat6x.installer.url.unix}</container.installer.url.unix>
+ <container.installer.url.windows>${tomcat6x.installer.url.windows}</container.installer.url.windows>
</properties>
</profile>
<profile>
@@ -132,9 +168,9 @@
</property>
</activation>
<properties>
- <container.version>5.1.0.GA</container.version>
- <container.installer.url.unix>file:/qa/tools/src/jboss/jboss-5.1.0.GA.zip</container.installer.url.unix>
- <container.installer.url.windows>file:t:\src\jboss\jboss-5.1.0.GA.zip</container.installer.url.windows>
+ <container.version>${jboss5x.version}</container.version>
+ <container.installer.url.unix>${jboss5x.installer.url.unix}</container.installer.url.unix>
+ <container.installer.url.windows>${jboss5x.installer.url.windows}</container.installer.url.windows>
</properties>
</profile>
<profile>
@@ -159,5 +195,22 @@
<container.installer.url>${container.installer.url.windows}</container.installer.url>
</properties>
</profile>
+ <!-- REPOSITORIES CONFIGURATION -->
+ <profile>
+ <id>repository-exadel</id>
+ <repositories>
+ <repository>
+ <!-- used for RichFaces release testing -->
+ <id>repository.exadel.com</id>
+ <url>http://repository.exadel.com</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
</profiles>
</profilesXml>
Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2009-12-08 14:42:15 UTC (rev 16097)
+++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2009-12-09 18:15:30 UTC (rev 16098)
@@ -71,6 +71,7 @@
*/
protected String mavenProjectBuildDirectory; // usually ${project}/target
protected String mavenResourcesDir; // usually ${project}/target/test-classes
+ protected boolean seleniumDebug; // if used specified debug mode of selenium testing
/**
* predefined waitings to use in inheritors
@@ -99,7 +100,7 @@
loggingTestListener = new SeleniumLoggingTestListener();
runner.addTestListener(loggingTestListener);
}
-
+
/**
* Initializes context before each class run.
*
@@ -116,23 +117,32 @@
* specifies on which port should selenium server run
*/
@BeforeClass
- @Parameters( { "context.root", "context.path", "browser", "selenium.host", "selenium.port", "maven.resources.dir",
- "maven.project.build.directory" })
+ @Parameters( { "context.root", "context.path", "browser", "selenium.host", "selenium.port", "selenium.debug",
+ "selenium.maximize", "maven.resources.dir", "maven.project.build.directory" })
public void initializeContext(String contextRoot, String contextPath, String browser, String seleniumHost,
- String seleniumPort, String mavenResourcesDir, String mavenProjectBuildDirectory) {
+ String seleniumPort, String seleniumDebug, String seleniumMaximize, String mavenResourcesDir,
+ String mavenProjectBuildDirectory) {
this.contextRoot = contextRoot;
this.contextPath = contextPath;
this.mavenResourcesDir = mavenResourcesDir;
this.mavenProjectBuildDirectory = mavenProjectBuildDirectory;
+ this.seleniumDebug = Boolean.valueOf(seleniumDebug);
selenium = new DefaultSelenium(seleniumHost, Integer.valueOf(seleniumPort), browser, contextRoot);
selenium.start();
allowInitialXpath();
loadCustomLocationStrategies();
+
// adding selenium-side logging facility
loggingTestListener.setSelenium(selenium);
+
+ if (Boolean.valueOf(seleniumMaximize)) {
+ // focus and maximaze tested window
+ selenium.windowFocus();
+ selenium.windowMaximize();
+ }
}
-
+
/**
* Uses selenium.addLocationStrategy to implement own strategies to locate
* items in the tested page
14 years, 5 months