JBoss Rich Faces SVN: r15964 - in branches/community/3.3.X/framework/test: src/main/java/org/ajax4jsf/tests and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-11-22 20:42:31 -0500 (Sun, 22 Nov 2009)
New Revision: 15964
Added:
branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockResourceHandler.java
branches/community/3.3.X/framework/test/src/main/resources/META-INF/resources-config.xml
Modified:
branches/community/3.3.X/framework/test/pom.xml
branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java
branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java
branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java
Log:
Framework: merged from 3.3.x_jsf2 branch
Modified: branches/community/3.3.X/framework/test/pom.xml
===================================================================
--- branches/community/3.3.X/framework/test/pom.xml 2009-11-22 18:29:15 UTC (rev 15963)
+++ branches/community/3.3.X/framework/test/pom.xml 2009-11-23 01:42:31 UTC (rev 15964)
@@ -12,7 +12,36 @@
<name>Ajax4Jsf test framework</name>
<url>https://ajax4jsf.dev.java.net</url>
+ <profiles>
+ <profile>
+ <id>jsf2_0</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <classifier>jsf2</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jsf1_2</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>com.sun.faces</groupId>
@@ -53,11 +82,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.14</version>
Modified: branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java
===================================================================
--- branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java 2009-11-22 18:29:15 UTC (rev 15963)
+++ branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java 2009-11-23 01:42:31 UTC (rev 15964)
@@ -49,6 +49,7 @@
clazz.getDeclaredFields();
application = (MockApplication) clazz.newInstance();
+ application.setResourceHandler(new MockResourceHandler());
return application;
} catch (NoClassDefFoundError e) {
Modified: branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java
===================================================================
--- branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java 2009-11-22 18:29:15 UTC (rev 15963)
+++ branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java 2009-11-23 01:42:31 UTC (rev 15964)
@@ -22,20 +22,25 @@
package org.ajax4jsf.tests;
import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import javax.faces.FacesException;
import javax.servlet.ServletContext;
+import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.apache.commons.collections.EnumerationUtils;
import org.apache.shale.test.mock.MockExternalContext12;
@@ -153,4 +158,165 @@
}
};
+ //JSF 2.0 methods
+
+// public javax.faces.context.Flash getFlash() {
+//
+// };
+
+ public void addResponseCookie(String name, String value, java.util.Map<String,Object> properties) {
+ Cookie cookie = new Cookie(name, value);
+ if (properties != null) {
+ String comment = (String) properties.get("comment");
+ if (comment != null) {
+ cookie.setComment(comment);
+ }
+ String domain = (String) properties.get("domain");
+ if (domain != null) {
+ cookie.setDomain(domain);
+ }
+ String path = (String) properties.get("path");
+ if (path != null) {
+ cookie.setPath(path);
+ }
+ Integer maxAge = (Integer) properties.get("maxAge");
+ if (maxAge != null) {
+ cookie.setMaxAge(maxAge);
+ }
+ Boolean secure = (Boolean) properties.get("secure");
+ if (secure != null) {
+ cookie.setSecure(secure);
+ }
+ }
+
+ ((HttpServletResponse) getResponse()).addCookie(cookie);
+ };
+
+ public String encodePartialActionURL(String url) {
+ return encodeActionURL(url);
+ };
+
+ public String getMimeType(String file) {
+ return "text/html";
+ }
+
+ public String getContextName() {
+ return ((ServletContext) this.getContext()).getServletContextName();
+ }
+
+ public String getRequestScheme() {
+ return ((HttpServletRequest) this.getRequest()).getScheme();
+ }
+
+ public String getRequestServerName() {
+ return ((HttpServletRequest) this.getRequest()).getServerName();
+ }
+
+ public int getRequestServerPort() {
+ return ((HttpServletRequest) this.getRequest()).getServerPort();
+ }
+
+ public String getRealPath(String path) {
+ return ((ServletContext) this.getContext()).getRealPath(path);
+ }
+
+ public int getRequestContentLength() {
+ return ((HttpServletRequest) this.getRequest()).getContentLength();
+ }
+
+ public OutputStream getResponseOutputStream() throws IOException {
+ return ((HttpServletResponse) this.getResponse()).getOutputStream();
+ }
+
+ public Writer getResponseOutputWriter() throws IOException {
+ return ((HttpServletResponse) this.getResponse()).getWriter();
+ }
+
+ public void setResponseContentType(String contentType) {
+ ((HttpServletResponse) this.getResponse()).setContentType(contentType);
+ }
+
+ public void invalidateSession() {
+ Object session = getSession(false);
+ if (session != null) {
+ ((HttpSession) session).invalidate();
+ }
+ }
+
+ public void setResponseHeader(String name, String value) {
+ ((HttpServletResponse) this.getResponse()).setHeader(name, value);
+ }
+
+ public void addResponseHeader(String name, String value) {
+ ((HttpServletResponse) this.getResponse()).addHeader(name, value);
+ }
+
+ public void setResponseBufferSize(int size) {
+ ((HttpServletResponse) this.getResponse()).setBufferSize(size);
+ }
+
+ public int getResponseBufferSize() {
+ return ((HttpServletResponse) this.getResponse()).getBufferSize();
+ }
+
+ public boolean isResponseCommitted() {
+ return ((HttpServletResponse) this.getResponse()).isCommitted();
+ }
+
+ public void responseReset() {
+ ((HttpServletResponse) this.getResponse()).reset();
+ }
+
+ public void responseSendError(int statusCode, String message)
+ throws IOException {
+ ((HttpServletResponse) this.getResponse()).sendError(statusCode, message);
+ }
+
+ public void setResponseStatus(int statusCode) {
+ ((HttpServletResponse) this.getResponse()).setStatus(statusCode);
+ }
+
+ public void responseFlushBuffer() throws IOException {
+ ((HttpServletResponse) this.getResponse()).flushBuffer();
+ }
+
+ public void setResponseContentLength(int length) {
+ ((HttpServletResponse) this.getResponse()).setContentLength(length);
+ }
+
+ private String encodeUrl(String baseUrl,
+ Map<String, List<String>> parameters) {
+
+ StringBuilder sb = new StringBuilder(baseUrl);
+ sb.append('?');
+
+ if (parameters != null) {
+ for (Map.Entry<String, List<String>> entry: parameters.entrySet()) {
+ List<String> values = entry.getValue();
+ if (values != null) {
+ String name = entry.getKey();
+ for (String value: values) {
+ sb.append(name);
+ sb.append('=');
+ sb.append(value);
+ sb.append('&');
+ }
+ }
+ }
+ }
+
+ return sb.toString();
+ }
+
+ public String encodeBookmarkableURL(String baseUrl,
+ Map<String, List<String>> parameters) {
+
+ return encodeUrl(baseUrl, parameters);
+ }
+
+ public String encodeRedirectURL(String baseUrl,
+ Map<String, List<String>> parameters) {
+
+ return encodeUrl(baseUrl, parameters);
+ }
}
Added: branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockResourceHandler.java
===================================================================
--- branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockResourceHandler.java (rev 0)
+++ branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockResourceHandler.java 2009-11-23 01:42:31 UTC (rev 15964)
@@ -0,0 +1,133 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright ${year}, 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.
+ */
+
+package org.ajax4jsf.tests;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.application.Resource;
+import javax.faces.application.ResourceHandler;
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.resource.FacesResourceContext;
+import org.ajax4jsf.resource.InternetResource;
+import org.ajax4jsf.resource.InternetResourceBuilder;
+import org.ajax4jsf.resource.ResourceNotFoundException;
+
+public class MockResourceHandler extends ResourceHandler {
+
+ @Override
+ public Resource createResource(String resourceName) {
+ return createResource(resourceName, null);
+ }
+
+ @Override
+ public Resource createResource(String resourceName, String libraryName) {
+ return createResource(resourceName, libraryName, null);
+ }
+
+ @Override
+ public Resource createResource(String resourceName, String libraryName,
+ String contentType) {
+
+ StringBuilder path = new StringBuilder();
+ if (libraryName != null) {
+ path.append(libraryName);
+ }
+
+ if (libraryName.length() > 0) {
+ path.append('/');
+ }
+
+ path.append(resourceName);
+
+ InternetResourceBuilder resourceBuilder = InternetResourceBuilder.getInstance();
+ try {
+ final InternetResource resource = resourceBuilder.getResource(path.toString());
+ return new Resource() {
+
+ @Override
+ public boolean userAgentNeedsUpdate(FacesContext context) {
+ return true;
+ }
+
+ @Override
+ public URL getURL() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Map<String, String> getResponseHeaders() {
+ return new HashMap<String, String>();
+ }
+
+ @Override
+ public String getRequestPath() {
+ return resource.getUri(FacesContext.getCurrentInstance(), null);
+ }
+
+ @Override
+ public InputStream getInputStream() throws IOException {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ return resource.getResourceAsStream(new FacesResourceContext(facesContext));
+ }
+ };
+ } catch (ResourceNotFoundException e) {
+ //ignore
+ }
+
+ return null;
+ }
+
+ @Override
+ public String getRendererTypeForResourceName(String resourceName) {
+ if (resourceName.endsWith(".js")) {
+ return "javax.faces.resource.Script";
+ }
+
+ if (resourceName.endsWith(".css")) {
+ return "javax.faces.resource.Stylesheet";
+ }
+
+ return null;
+ }
+
+ @Override
+ public void handleResourceRequest(FacesContext context) throws IOException {
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean isResourceRequest(FacesContext context) {
+ return false;
+ }
+
+ @Override
+ public boolean libraryExists(String libraryName) {
+ return true;
+ }
+
+}
Modified: branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java
===================================================================
--- branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java 2009-11-22 18:29:15 UTC (rev 15963)
+++ branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java 2009-11-23 01:42:31 UTC (rev 15964)
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.net.URL;
+
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
@@ -210,6 +211,16 @@
("faces-config/validator/validator-id", "setValidatorId", 0);
digester.addCallMethod
("faces-config/validator/validator-class", "setValidatorClass", 0);
+
+ digester.addRule("faces-config/factory/visit-context-factory", new Rule() {
+ @Override
+ public void body(String namespace, String name, String text)
+ throws Exception {
+ if (text != null && text.trim().length() != 0) {
+ FactoryFinder.setFactory("javax.faces.component.visit.VisitContextFactory", text.trim());
+ }
+ }
+ });
}
digester.setEntityResolver(new FacesEntityResolver());
Added: branches/community/3.3.X/framework/test/src/main/resources/META-INF/resources-config.xml
===================================================================
--- branches/community/3.3.X/framework/test/src/main/resources/META-INF/resources-config.xml (rev 0)
+++ branches/community/3.3.X/framework/test/src/main/resources/META-INF/resources-config.xml 2009-11-23 01:42:31 UTC (rev 15964)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+ <resource>
+ <name>javax.faces/jsf.js</name>
+ <path>META-INF/resources/javax.faces/jsf.js</path>
+ <renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
+ </resource>
+</resource-config>
15 years, 3 months
JBoss Rich Faces SVN: r15963 - in branches/community/3.3.X/samples/panelbar-sample/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-11-22 13:29:15 -0500 (Sun, 22 Nov 2009)
New Revision: 15963
Added:
branches/community/3.3.X/samples/panelbar-sample/src/main/webapp/pages/RF-7764.jsp
Modified:
branches/community/3.3.X/samples/panelbar-sample/src/main/java/org/richfaces/samples/panelbar/Bean.java
Log:
RF-7764
Modified: branches/community/3.3.X/samples/panelbar-sample/src/main/java/org/richfaces/samples/panelbar/Bean.java
===================================================================
--- branches/community/3.3.X/samples/panelbar-sample/src/main/java/org/richfaces/samples/panelbar/Bean.java 2009-11-22 18:13:29 UTC (rev 15962)
+++ branches/community/3.3.X/samples/panelbar-sample/src/main/java/org/richfaces/samples/panelbar/Bean.java 2009-11-22 18:29:15 UTC (rev 15963)
@@ -25,10 +25,10 @@
*
*/
public class Bean {
-
private String width = "300px";
private String height = "300px";
private String label = "Default label";
+ private String value = "item_01";
public String getHeight() {
return height;
@@ -48,5 +48,10 @@
public void setWidth(String width) {
this.width = width;
}
-
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
}
\ No newline at end of file
Added: branches/community/3.3.X/samples/panelbar-sample/src/main/webapp/pages/RF-7764.jsp
===================================================================
--- branches/community/3.3.X/samples/panelbar-sample/src/main/webapp/pages/RF-7764.jsp (rev 0)
+++ branches/community/3.3.X/samples/panelbar-sample/src/main/webapp/pages/RF-7764.jsp 2009-11-22 18:29:15 UTC (rev 15963)
@@ -0,0 +1,35 @@
+<%@ 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/panelbar" prefix="rich" %>
+<html>
+
+<head>
+</head>
+
+<body>
+<f:view>
+ <h:form>
+ <h:messages style="color:red"/>
+
+ <rich:panelBar id="panelBarId" height="400" width="500" selectedPanel="#{bean.value}" >
+ <a4j:support event="onitemchange"/>
+
+ <rich:panelBarItem id="item_01" label="#{bean.label}" >
+ <h:outputText value="-1-"/>
+ </rich:panelBarItem>
+
+ <rich:panelBarItem id="item_02" label="#{bean.label}">
+ <h:outputText value="-2-"/>
+ </rich:panelBarItem>
+ </rich:panelBar>
+
+ <h:panelGrid columns="3">
+ <h:outputText value="Label:"/>
+ <h:inputText value="#{bean.label}"/>
+ <h:commandButton value="Change!"/>
+ </h:panelGrid>
+ </h:form>
+</f:view>
+</body>
+</html>
15 years, 3 months
JBoss Rich Faces SVN: r15962 - branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-11-22 13:13:29 -0500 (Sun, 22 Nov 2009)
New Revision: 15962
Modified:
branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java
Log:
RF-7347
Modified: branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java
===================================================================
--- branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java 2009-11-22 16:13:11 UTC (rev 15961)
+++ branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java 2009-11-22 18:13:29 UTC (rev 15962)
@@ -366,6 +366,10 @@
assertTrue(result.contains(content));
}
+ public void testRF7347_3() throws Exception {
+ assertHtml2SeamConverting("<p><b>qwe</b>123</p>");
+ }
+
public void testUglyTextFromWord() throws Exception {
final String str = "<p><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\"/><meta content=\"Word.Document\" name=\"ProgId\"/><meta content=\"Microsoft Word 12\" name=\"Generator\"/><meta content=\"Microsoft Word 12\" name=\"Originator\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_filelist.xml\" rel=\"File-List\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_themedata.thmx\" rel=\"themeData\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_colorschememapping.xml\" rel=\"colorSchemeMapping\"/>"
+ "<!--[if gte mso 9]><xml>\n"
15 years, 3 months
JBoss Rich Faces SVN: r15960 - in branches/sandbox/3.3.X_JSF2/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html: script and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-11-22 11:11:32 -0500 (Sun, 22 Nov 2009)
New Revision: 15960
Modified:
branches/sandbox/3.3.X_JSF2/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
branches/sandbox/3.3.X_JSF2/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js
Log:
inputNumberSlider: orientation vertical - broken.
https://jira.jboss.org/jira/browse/RF-8152
Modified: branches/sandbox/3.3.X_JSF2/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
===================================================================
--- branches/sandbox/3.3.X_JSF2/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss 2009-11-22 14:08:00 UTC (rev 15959)
+++ branches/sandbox/3.3.X_JSF2/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss 2009-11-22 16:11:32 UTC (rev 15960)
@@ -99,6 +99,17 @@
text-align : center;
z-index : 1;
}
+
+.rich-inslider-handler-selected-vertical{
+ background-color : transparent;
+ width : 7px;
+ height : 8px;
+ font-size : 1px;
+ position : absolute;
+ text-align : center;
+ z-index : 1;
+}
+
.rich-inslider-track{
background-position: left top;
background-repeat: repeat-x;
Modified: branches/sandbox/3.3.X_JSF2/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js
===================================================================
--- branches/sandbox/3.3.X_JSF2/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-11-22 14:08:00 UTC (rev 15959)
+++ branches/sandbox/3.3.X_JSF2/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-11-22 16:11:32 UTC (rev 15960)
@@ -24,11 +24,11 @@
};
Object.extend(defaultOptions, options);
this.handle = $( id + "Handle" );
- this.tip = $( id + "Tip" );
- this.track = $( id + "Track" );
- this.mainTable = $( id );
+ this.tip = $( id + "Tip" );
+ this.track = $( id + "Track" );
+ this.mainTable = $( id );
var inputId = id + "Input";
- this.input = $(inputId) || document.getElementsByName(inputId)[0];
+ this.input = $(inputId) || document.getElementsByName(inputId)[0];
if(defaultOptions.showArrows){
var arrowIncId = id + "ArrowInc";
this.arrowInc = $(arrowIncId) || document.getElementsByName(arrowIncId)[0];
@@ -57,9 +57,9 @@
this.classes.arrowSelected = "rich-inslider-handler-selected-vertical";
this.classes.base = " " + this.trim(this.classes.temp.replace("rich-inslider-handler-vertical",""));
}
-
- this.classes.handleSelected = " " + defaultOptions.handleSelectedClass;
+ this.classes.handleSelected = defaultOptions.handleSelectedClass ? " " + defaultOptions.handleSelectedClass : "";
+
this.table = this.findTableForTrack(this.track);
this.input.value = this.options.sliderValue;
@@ -356,10 +356,12 @@
},
startDrag: function(event) {
- if (this.editInFocus)
+ if (this.editInFocus) {
this.input.blur();
- window.document.onmouseup = this.eventMouseUp.bindAsEventListener(this);
- window.document.onmousemove = this.eventMouseMove.bindAsEventListener(this);
+ }
+
+ window.document.onmouseup = this.eventMouseUp.bindAsEventListener(this);
+ window.document.onmousemove = this.eventMouseMove.bindAsEventListener(this);
Event.observe(document, "mouseout", this.eventWindowMouseOut);
this.editBlur();
this.prevMouseDownEvent = event;
@@ -381,7 +383,7 @@
} else {
pointer = Event.pointerX(event);
}
- var offsets = Position.cumulativeOffset(this.track);
+ var offsets = Position.cumulativeOffset(this.track);
this.updating = true;
var value;
15 years, 3 months
JBoss Rich Faces SVN: r15958 - branches/sandbox/3.3.X_JSF2/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-11-22 09:06:47 -0500 (Sun, 22 Nov 2009)
New Revision: 15958
Modified:
branches/sandbox/3.3.X_JSF2/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
Log:
3.3.2GA combobox: in right-to-left languages (when dir=rtl) the selectedItem is partially hidden by the button
https://jira.jboss.org/jira/browse/RF-8028
Modified: branches/sandbox/3.3.X_JSF2/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- branches/sandbox/3.3.X_JSF2/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2009-11-22 02:29:37 UTC (rev 15957)
+++ branches/sandbox/3.3.X_JSF2/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2009-11-22 14:06:47 UTC (rev 15958)
@@ -17,7 +17,9 @@
this.tempItem;
this.BUTTON_WIDTH = 17; //px
-
+ this.BUTTON_LEFT_BORDER = 1; //px
+ this.BUTTON_RIGHT_BORDER = 1; //px
+
this.classes = Richfaces.mergeStyles(options.userStyles,new Richfaces.ComboBoxStyles().getCommonStyles());
@@ -115,8 +117,18 @@
},
setInputWidth : function() {
- var width = parseInt(this.field.parentNode.style.width) - this.BUTTON_WIDTH;
- this.field.style.width = width + "px";
+ var width;
+ if (Richfaces.browser.isIE6) {
+ width = parseInt(this.field.parentNode.style.width) - this.BUTTON_WIDTH;
+ } else {
+ width = parseInt(this.field.parentNode.style.width)
+ - parseInt(Element.getStyle(this.field, Richfaces.borders.l))
+ - parseInt(Element.getStyle(this.field, Richfaces.paddings.l))
+ - parseInt(Element.getStyle(this.field, Richfaces.paddings.r))
+ - parseInt(Element.getStyle(this.field, Richfaces.borders.r));
+ width -= this.buttonBG.offsetWidth ? this.buttonBG.offsetWidth : this.BUTTON_WIDTH;
+ }
+ this.field.style.width = width + "px";
},
buttonClickHandler : function(event) {
15 years, 3 months
JBoss Rich Faces SVN: r15957 - branches/community/3.3.X/framework/impl.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-11-21 21:29:37 -0500 (Sat, 21 Nov 2009)
New Revision: 15957
Modified:
branches/community/3.3.X/framework/impl/pom.xml
Log:
Fixed: pom not installed for jsf2_0 profile
Modified: branches/community/3.3.X/framework/impl/pom.xml
===================================================================
--- branches/community/3.3.X/framework/impl/pom.xml 2009-11-22 02:29:15 UTC (rev 15956)
+++ branches/community/3.3.X/framework/impl/pom.xml 2009-11-22 02:29:37 UTC (rev 15957)
@@ -21,6 +21,11 @@
</resources>
<plugins>
<plugin>
+ <!-- Necessary due to http://jira.codehaus.org/browse/MINSTALL-41 -->
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.4</version>
15 years, 3 months
JBoss Rich Faces SVN: r15956 - in branches/community/3.3.X/ui: core/src/main/config/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-11-21 21:29:15 -0500 (Sat, 21 Nov 2009)
New Revision: 15956
Modified:
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputSecret.java
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputText.java
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputTextarea.java
branches/community/3.3.X/ui/core/src/main/config/component/actionParameter.xml
branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java
Log:
UI: merged from 3.3.x_jsf2 branch
Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputSecret.java
===================================================================
--- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputSecret.java 2009-11-22 02:22:13 UTC (rev 15955)
+++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputSecret.java 2009-11-22 02:29:15 UTC (rev 15956)
@@ -76,7 +76,7 @@
}
}
- private static boolean isEmpty(Object value) {
+ public static boolean isEmpty(Object value) {
if (value == null) {
return true;
Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputText.java
===================================================================
--- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputText.java 2009-11-22 02:22:13 UTC (rev 15955)
+++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputText.java 2009-11-22 02:29:15 UTC (rev 15956)
@@ -77,7 +77,7 @@
}
- private static boolean isEmpty(Object value) {
+ public static boolean isEmpty(Object value) {
if (value == null) {
return true;
Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputTextarea.java
===================================================================
--- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputTextarea.java 2009-11-22 02:22:13 UTC (rev 15955)
+++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputTextarea.java 2009-11-22 02:29:15 UTC (rev 15956)
@@ -77,7 +77,7 @@
}
- private static boolean isEmpty(Object value) {
+ public static boolean isEmpty(Object value) {
if (value == null) {
return (true);
Modified: branches/community/3.3.X/ui/core/src/main/config/component/actionParameter.xml
===================================================================
--- branches/community/3.3.X/ui/core/src/main/config/component/actionParameter.xml 2009-11-22 02:22:13 UTC (rev 15955)
+++ branches/community/3.3.X/ui/core/src/main/config/component/actionParameter.xml 2009-11-22 02:29:15 UTC (rev 15956)
@@ -34,7 +34,7 @@
<superclass>
org.ajax4jsf.taglib.html.jsp.ActionParamTag
</superclass>
- <test/>
+
<description>
<![CDATA[
A combination of the functionality of two JSF tags,
@@ -52,6 +52,7 @@
<br />
]]>
</description>
+ <test/>
</tag>
<taghandler generate="false">
<classname>org.ajax4jsf.taglib.html.facelets.ActionParamHandler</classname>
Modified: branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java
===================================================================
--- branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java 2009-11-22 02:22:13 UTC (rev 15955)
+++ branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java 2009-11-22 02:29:15 UTC (rev 15956)
@@ -254,7 +254,7 @@
* @return
* @see javax.faces.application.Application#getConverterTypes()
*/
- public Iterator<Class> getConverterTypes() {
+ public Iterator<Class<?>> getConverterTypes() {
return parent.getConverterTypes();
}
15 years, 3 months
JBoss Rich Faces SVN: r15955 - in branches/community/3.3.X/ui: beanValidator and 33 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-11-21 21:22:13 -0500 (Sat, 21 Nov 2009)
New Revision: 15955
Modified:
branches/community/3.3.X/ui/beanValidator/pom.xml
branches/community/3.3.X/ui/calendar/pom.xml
branches/community/3.3.X/ui/colorPicker/pom.xml
branches/community/3.3.X/ui/columns/pom.xml
branches/community/3.3.X/ui/combobox/pom.xml
branches/community/3.3.X/ui/componentControl/pom.xml
branches/community/3.3.X/ui/contextMenu/pom.xml
branches/community/3.3.X/ui/dataFilterSlider/pom.xml
branches/community/3.3.X/ui/datascroller/pom.xml
branches/community/3.3.X/ui/dropdown-menu/pom.xml
branches/community/3.3.X/ui/editor/pom.xml
branches/community/3.3.X/ui/extendedDataTable/pom.xml
branches/community/3.3.X/ui/fileUpload/pom.xml
branches/community/3.3.X/ui/functions/pom.xml
branches/community/3.3.X/ui/hotKey/pom.xml
branches/community/3.3.X/ui/inplaceInput/pom.xml
branches/community/3.3.X/ui/inplaceSelect/pom.xml
branches/community/3.3.X/ui/layout/pom.xml
branches/community/3.3.X/ui/menu-components/pom.xml
branches/community/3.3.X/ui/message/pom.xml
branches/community/3.3.X/ui/panel/pom.xml
branches/community/3.3.X/ui/panelmenu/pom.xml
branches/community/3.3.X/ui/pickList/pom.xml
branches/community/3.3.X/ui/pom.xml
branches/community/3.3.X/ui/progressBAR/pom.xml
branches/community/3.3.X/ui/scrollableDataTable/pom.xml
branches/community/3.3.X/ui/simpleTogglePanel/pom.xml
branches/community/3.3.X/ui/spacer/pom.xml
branches/community/3.3.X/ui/state/pom.xml
branches/community/3.3.X/ui/suggestionbox/pom.xml
branches/community/3.3.X/ui/tabPanel/pom.xml
branches/community/3.3.X/ui/togglePanel/pom.xml
branches/community/3.3.X/ui/toolBar/pom.xml
branches/community/3.3.X/ui/tooltip/pom.xml
branches/community/3.3.X/ui/treeModel/pom.xml
Log:
Framework: merged from 3.3.x_jsf2 branch
Modified: branches/community/3.3.X/ui/beanValidator/pom.xml
===================================================================
--- branches/community/3.3.X/ui/beanValidator/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/beanValidator/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -44,11 +44,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>message</artifactId>
<version>3.3.3-SNAPSHOT</version>
Modified: branches/community/3.3.X/ui/calendar/pom.xml
===================================================================
--- branches/community/3.3.X/ui/calendar/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/calendar/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -42,11 +42,6 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
Modified: branches/community/3.3.X/ui/colorPicker/pom.xml
===================================================================
--- branches/community/3.3.X/ui/colorPicker/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/colorPicker/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -1,55 +1,50 @@
-<?xml version="1.0"?><project>
- <parent>
- <artifactId>ui</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.3.3-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>colorPicker</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-cdk-plugin</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-test-sources</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>generate-tests</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <library>
- <prefix>org.richfaces.ui</prefix>
- <taglib>
- <shortName>colorPicker</shortName>
- </taglib>
- </library>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>ui</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.3.3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>colorPicker</artifactId>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>3.3.3-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>generate-tests</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <library>
+ <prefix>org.richfaces.ui</prefix>
+ <taglib>
+ <shortName>colorPicker</shortName>
+ </taglib>
+ </library>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: branches/community/3.3.X/ui/columns/pom.xml
===================================================================
--- branches/community/3.3.X/ui/columns/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/columns/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,11 +41,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>dataTable</artifactId>
<version>${project.version}</version>
@@ -57,4 +52,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: branches/community/3.3.X/ui/combobox/pom.xml
===================================================================
--- branches/community/3.3.X/ui/combobox/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/combobox/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -48,11 +48,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>suggestionbox</artifactId>
Modified: branches/community/3.3.X/ui/componentControl/pom.xml
===================================================================
--- branches/community/3.3.X/ui/componentControl/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/componentControl/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -47,10 +47,5 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/contextMenu/pom.xml
===================================================================
--- branches/community/3.3.X/ui/contextMenu/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/contextMenu/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -49,11 +49,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>menu-components</artifactId>
<version>3.3.3-SNAPSHOT</version>
Modified: branches/community/3.3.X/ui/dataFilterSlider/pom.xml
===================================================================
--- branches/community/3.3.X/ui/dataFilterSlider/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/dataFilterSlider/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -42,10 +42,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/datascroller/pom.xml
===================================================================
--- branches/community/3.3.X/ui/datascroller/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/datascroller/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,10 +41,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/dropdown-menu/pom.xml
===================================================================
--- branches/community/3.3.X/ui/dropdown-menu/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/dropdown-menu/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -42,11 +42,6 @@
</build>
<dependencies>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>menu-components</artifactId>
<version>3.3.3-SNAPSHOT</version>
Modified: branches/community/3.3.X/ui/editor/pom.xml
===================================================================
--- branches/community/3.3.X/ui/editor/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/editor/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -59,11 +59,6 @@
</profiles>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
Modified: branches/community/3.3.X/ui/extendedDataTable/pom.xml
===================================================================
--- branches/community/3.3.X/ui/extendedDataTable/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/extendedDataTable/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -61,11 +61,6 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>drag-drop</artifactId>
Modified: branches/community/3.3.X/ui/fileUpload/pom.xml
===================================================================
--- branches/community/3.3.X/ui/fileUpload/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/fileUpload/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -48,11 +48,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>progressBar</artifactId>
Modified: branches/community/3.3.X/ui/functions/pom.xml
===================================================================
--- branches/community/3.3.X/ui/functions/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/functions/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -34,10 +34,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: branches/community/3.3.X/ui/hotKey/pom.xml
===================================================================
--- branches/community/3.3.X/ui/hotKey/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/hotKey/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -47,10 +47,5 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/inplaceInput/pom.xml
===================================================================
--- branches/community/3.3.X/ui/inplaceInput/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/inplaceInput/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -49,11 +49,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>combobox</artifactId>
<version>3.3.3-SNAPSHOT</version>
Modified: branches/community/3.3.X/ui/inplaceSelect/pom.xml
===================================================================
--- branches/community/3.3.X/ui/inplaceSelect/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/inplaceSelect/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -48,16 +48,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>combobox</artifactId>
Modified: branches/community/3.3.X/ui/layout/pom.xml
===================================================================
--- branches/community/3.3.X/ui/layout/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/layout/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -44,11 +44,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- </dependencies>
</project>
Modified: branches/community/3.3.X/ui/menu-components/pom.xml
===================================================================
--- branches/community/3.3.X/ui/menu-components/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/menu-components/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,10 +41,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/message/pom.xml
===================================================================
--- branches/community/3.3.X/ui/message/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/message/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -42,10 +42,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/panel/pom.xml
===================================================================
--- branches/community/3.3.X/ui/panel/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/panel/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,11 +41,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: branches/community/3.3.X/ui/panelmenu/pom.xml
===================================================================
--- branches/community/3.3.X/ui/panelmenu/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/panelmenu/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,10 +41,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/pickList/pom.xml
===================================================================
--- branches/community/3.3.X/ui/pickList/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/pickList/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -50,19 +50,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
-
-
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>listShuttle</artifactId>
Modified: branches/community/3.3.X/ui/pom.xml
===================================================================
--- branches/community/3.3.X/ui/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -80,6 +80,54 @@
</resources>
</build>
</profile>
+ <profile>
+ <id>jsf2_0</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>2.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>jsf2</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jsf1_2</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_12</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_12</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
</profiles>
<modules>
<module>core</module>
@@ -137,11 +185,6 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-test</artifactId>
<version>3.3.3-SNAPSHOT</version>
<scope>test</scope>
@@ -149,7 +192,7 @@
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
- <version>1.1.14</version>
+ <version>1.1.15.B1</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -182,11 +225,5 @@
<version>1.1.2</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_12</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: branches/community/3.3.X/ui/progressBAR/pom.xml
===================================================================
--- branches/community/3.3.X/ui/progressBAR/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/progressBAR/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -43,11 +43,6 @@
</build>
<dependencies>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core</artifactId>
<version>3.3.3-SNAPSHOT</version>
Modified: branches/community/3.3.X/ui/scrollableDataTable/pom.xml
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/scrollableDataTable/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -68,11 +68,6 @@
</build>
<dependencies>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>dataTable</artifactId>
<version>3.3.3-SNAPSHOT</version>
Modified: branches/community/3.3.X/ui/simpleTogglePanel/pom.xml
===================================================================
--- branches/community/3.3.X/ui/simpleTogglePanel/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/simpleTogglePanel/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,10 +41,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/spacer/pom.xml
===================================================================
--- branches/community/3.3.X/ui/spacer/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/spacer/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,10 +41,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/state/pom.xml
===================================================================
--- branches/community/3.3.X/ui/state/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/state/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -33,11 +33,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- </dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/suggestionbox/pom.xml
===================================================================
--- branches/community/3.3.X/ui/suggestionbox/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/suggestionbox/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,10 +41,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/tabPanel/pom.xml
===================================================================
--- branches/community/3.3.X/ui/tabPanel/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/tabPanel/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,10 +41,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/togglePanel/pom.xml
===================================================================
--- branches/community/3.3.X/ui/togglePanel/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/togglePanel/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,10 +41,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/toolBar/pom.xml
===================================================================
--- branches/community/3.3.X/ui/toolBar/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/toolBar/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,10 +41,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/tooltip/pom.xml
===================================================================
--- branches/community/3.3.X/ui/tooltip/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/tooltip/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -41,10 +41,5 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/treeModel/pom.xml
===================================================================
--- branches/community/3.3.X/ui/treeModel/pom.xml 2009-11-22 02:11:34 UTC (rev 15954)
+++ branches/community/3.3.X/ui/treeModel/pom.xml 2009-11-22 02:22:13 UTC (rev 15955)
@@ -43,11 +43,6 @@
</build>
<dependencies>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>tree</artifactId>
<version>3.3.3-SNAPSHOT</version>
15 years, 3 months