October 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r10764 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.

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

Author: dsvyatobatsko Date: 2008-10-15 10:38:24 -0400 (Wed, 15 Oct 2008) New Revision: 10764 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanelTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java Log: SimpleTogglePanel: test styles and classes are output to client Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanelTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java 2008-10-15 12:51:15 UTC (rev 10763) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java 2008-10-15 14:38:24 UTC (rev 10764) @@ -129,6 +129,24 @@ tester.testRequestParameters(params); } + @Test + public void testStyleAndClassesAreOutputToClient(Template template) { + renderPage(template); + + writeStatus("Check style and classes are output to client"); + + String compDivId = getParentId() + "_form:panel1"; + + String headerDivId = compDivId + "_header"; + String bodyDivId = compDivId + "_body"; + + assertStyleAttribute(compDivId, "font-size: 13px", "Style attribute was not output to client"); + assertClassNames(compDivId, new String[] { "noclass" }, "Class attribute was not output to client", true); + + assertClassNames(headerDivId, new String[] { "header-class" }, "headerClass attribute was not output to client", true); + assertClassNames(bodyDivId, new String[] { "body-class" }, "bodyClass attribute was not output to client", true); + } + @Override public void sendAjax() { clickAjaxCommandAndWait(getAutoTester(this).getClientId(AutoTester.COMPONENT_ID) + "_header");

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r10763 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.

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

Author: konstantin.mishin Date: 2008-10-15 08:51:15 -0400 (Wed, 15 Oct 2008) New Revision: 10763 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java Log: converter defined by component attribute and configured at application level works Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2008-10-15 12:50:59 UTC (rev 10762) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2008-10-15 12:51:15 UTC (rev 10763) @@ -87,6 +87,15 @@ } /** + * converter defined by component attribute and configured at application level works + */ + @Test + public void testConverter(Template template) { + init(template); + AssertValueEquals(lsId + ":0StateInput", "0:1:Item1", "Converter doesn't work."); + } + + /** * component with rendered = false is not present on the page */ @Test

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r10762 - trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/listShuttle.

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

Author: konstantin.mishin Date: 2008-10-15 08:50:59 -0400 (Wed, 15 Oct 2008) New Revision: 10762 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/listShuttle/listShuttleTest.xhtml Log: small fix Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/listShuttle/listShuttleTest.xhtml =================================================================== (Binary files differ)

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r10761 - in trunk: framework/test/src/main/java/org/ajax4jsf/tests and 29 other directories.

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

Author: amarkhel Date: 2008-10-15 05:52:22 -0400 (Wed, 15 Oct 2008) New Revision: 10761 Added: trunk/framework/test/src/main/java/org/ajax4jsf/tests/TestFileUtils.java Modified: trunk/framework/impl/src/test/resources/WEB-INF/web.xml trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx trunk/ui/combobox/src/main/templates/combobox.jspx trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxStatusRendererTest.java trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java trunk/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java trunk/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java trunk/ui/paint2D/src/main/config/component/paint2D.xml trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java trunk/ui/tabPanel/src/main/templates/tab.jspx trunk/ui/tabPanel/src/main/templates/tabHeader.jspx trunk/ui/tabPanel/src/main/templates/tabPanel.jspx trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java trunk/ui/tree/src/main/templates/htmlTreeNode.jspx Log: Fix bug RF-2229 Modified: trunk/framework/impl/src/test/resources/WEB-INF/web.xml =================================================================== --- trunk/framework/impl/src/test/resources/WEB-INF/web.xml 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/framework/impl/src/test/resources/WEB-INF/web.xml 2008-10-15 09:52:22 UTC (rev 10761) @@ -15,7 +15,53 @@ <filter> <filter-name>foo</filter-name> <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> + </filter> + <filter> + <description>Convert HTML to XML</description> + <display-name>Filter</display-name> + <filter-name>A4J</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + <init-param> + <param-name>publicid</param-name> + <param-value>-//W3C//DTD XHTML 1.0 Transitional//EN</param-value> + </init-param> + <init-param> + <param-name>systemid</param-name> + <param-value>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</param-value> + </init-param> + <init-param> + <param-name>namespace</param-name> + <param-value>http://www.w3.org/1999/xhtml</param-value> + </init-param> + <init-param> + <param-name>forceparser</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>rewriteid</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>mime-type</param-name> + <param-value>text/xml</param-value> + </init-param> + <init-param> + <param-name>log4j-init-file</param-name> + <param-value>WEB-INF/log4j.xml</param-value> + </init-param> + <init-param> + <param-name>enable-cache</param-name> + <param-value>true</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>A4J</filter-name> + <url-pattern>*.jsf</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>A4J</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> <filter-mapping> <filter-name>foo</filter-name> <servlet-name>Faces Servlet</servlet-name> Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -29,9 +29,15 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.io.RandomAccessFile; import java.lang.reflect.Field; import java.net.MalformedURLException; import java.net.URL; +import java.nio.channels.FileChannel; +import java.nio.channels.FileLock; +import java.nio.channels.OverlappingFileLockException; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; @@ -60,6 +66,7 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.AjaxContextImpl; @@ -112,6 +119,8 @@ */ public class AbstractAjax4JsfTestCase extends AbstractJsfTestCase { + + private static final String IMAGE_NOT_FOUND_OR_UNAVAILABLE_MESSAGE = "Image not found or unavailable"; private static final String RESOURCE_NOT_FOUND_MESSAGE = "Resource not found"; @@ -136,7 +145,6 @@ */ public AbstractAjax4JsfTestCase(String name) { super(name); - // TODO Auto-generated constructor stub } /* (non-Javadoc) @@ -614,62 +622,26 @@ HtmlPage htmlPage = processResponseWriter(); - /* https://jira.jboss.org/jira/browse/RF-2229 - DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); - documentBuilderFactory.setValidating(true); - DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); - - documentBuilder.setEntityResolver(new EntityResolverImpl()); - - final List<String> messagesList = new ArrayList<String>(); - - documentBuilder.setErrorHandler(new ErrorHandler() { - - public void error(SAXParseException exception) throws SAXException { - messagesList.add(exception.toString()); - } - - public void fatalError(SAXParseException exception) - throws SAXException { - messagesList.add(exception.toString()); - } - - public void warning(SAXParseException exception) - throws SAXException { - messagesList.add(exception.toString()); - } - - }); - - try { - documentBuilder.parse(htmlPage.getWebResponse().getContentAsStream()); - } catch (Exception e) { - System.err.println(e.getLocalizedMessage()); + //https://jira.jboss.org/jira/browse/RF-2229 + if (TestFileUtils.needXHTMLCheck()) { + checkXHTML(htmlPage); } - File file = new File("c:\\tmp\\report1.txt"); - file.createNewFile(); - FileWriter fw = new FileWriter(file, true); - - fw.write(toString() + "\r\n"); - - if (!messagesList.isEmpty()) { - fw.write(htmlPage.getWebResponse().getContentAsString()); - fw.write("\r\n"); - - for (String string : messagesList) { - fw.write(string); - } - fw.write("\r\n"); - fw.write("\r\n"); - } - - - fw.close(); - */ - return htmlPage; } + + private void checkXHTML(HtmlPage htmlPage) throws ParserConfigurationException, IOException { + String respons = htmlPage.getWebResponse().getContentAsString(); + int index = respons.lastIndexOf("<!DOCTYPE"); + String response = respons.substring(index); + InputStream is = htmlPage.getWebResponse().getContentAsStream(); + + byte[] b = new byte[response.length()]; + is.skip(index); + is.read(b); + ByteArrayInputStream stream = new ByteArrayInputStream(b); + TestFileUtils.checkXHTML(new EntityResolverImpl(), response, stream); + } /** * Implements default XML filter to emulate A4J filter that invoked while Added: trunk/framework/test/src/main/java/org/ajax4jsf/tests/TestFileUtils.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/TestFileUtils.java (rev 0) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/TestFileUtils.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -0,0 +1,192 @@ +package org.ajax4jsf.tests; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.io.RandomAccessFile; +import java.nio.channels.FileChannel; +import java.nio.channels.FileLock; +import java.nio.channels.OverlappingFileLockException; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.xml.sax.EntityResolver; +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; + + class TestFileUtils { + private static final String ORG_AJAX4JSF_TEST_CHECK_XHTML_FILE = "org.ajax4jsf.test.checkXHTML.file"; + + private static final String ORG_AJAX4JSF_TEST_CHECK_XHTML = "org.ajax4jsf.test.checkXHTML"; + + private static final String CRLF = "\r\n"; + + private static Boolean isCheckXHTML = null; + + private static String checkXHTMLOutputFile = null; + + private static boolean initialized = false; + + private static File testOutputFile = null; + + private TestFileUtils(){ + throw new UnsupportedOperationException(); + } + + static void checkXHTML(EntityResolver resolver, String response, InputStream is){ + final List<String> messagesList = new ArrayList<String>(); + try{ + DocumentBuilder documentBuilder = createDocumentBuilder(); + documentBuilder.setEntityResolver(resolver); + setupBuilder(messagesList, documentBuilder); + TestFileUtils.parseResponse(is, documentBuilder); + TestFileUtils.printXHTMLValidationError(response, messagesList); + }catch(ParserConfigurationException pce){ + System.err.println(pce.getLocalizedMessage()); + }catch(IOException ioe){ + System.err.println(ioe.getLocalizedMessage()); + } + + } + + static void setupBuilder(final List<String> messagesList, DocumentBuilder documentBuilder) { + + documentBuilder.setErrorHandler(new ErrorHandler() { + + public void error(SAXParseException exception) throws SAXException { + messagesList.add(exception.toString()); + } + + public void fatalError(SAXParseException exception) + throws SAXException { + messagesList.add(exception.toString()); + } + + public void warning(SAXParseException exception) + throws SAXException { + messagesList.add(exception.toString()); + } + + }); + } + + static void initialize(){ + try { + if (null == isCheckXHTML) { + isCheckXHTML = Boolean.getBoolean(ORG_AJAX4JSF_TEST_CHECK_XHTML); + if (isCheckXHTML) { + checkXHTMLOutputFile = System.getProperty(ORG_AJAX4JSF_TEST_CHECK_XHTML_FILE); + } + } + initialized = true; + } catch (Exception e) { + // If we catch Exception there - it is security Manager error. + System.out.println("Security Manager error:"); + System.err.println(e.getLocalizedMessage()); + } + } + + static DocumentBuilder createDocumentBuilder() throws ParserConfigurationException { + + DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); + documentBuilderFactory.setValidating(true); + DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + return documentBuilder; + } + + private static void printErrors(String response, final List<String> messagesList, OutputStreamWriter fw) throws IOException { + fw.write(CRLF); + if (!messagesList.isEmpty()) { + fw.write(response); + fw.write(CRLF); + + for (String string : messagesList) { + fw.write(string); + fw.write(CRLF); + } + fw.write(CRLF); + fw.write(CRLF); + } + } + + static boolean needXHTMLCheck(){ + if(!initialized ){ + initialize(); + } + return isCheckXHTML; + } + + static void parseResponse(InputStream is, DocumentBuilder documentBuilder) { + try { + documentBuilder.parse(is); + } catch (SAXException e) { + System.err.println(e.getLocalizedMessage()); + } catch (IOException e) { + System.err.println(e.getLocalizedMessage()); + } + } + + static void printXHTMLValidationError(String response, final List<String> messagesList) throws IOException { + //checkXHTMLOutputFile = "C:/123.txt"; + OutputStreamWriter fw = null; + try { + if (checkXHTMLOutputFile != null) { + if(null == testOutputFile){ + testOutputFile = new File(checkXHTMLOutputFile); + //if(testOutputFile.exists()){ + // testOutputFile.delete(); + //} + testOutputFile.createNewFile(); + } + //FileChannel channel = new RandomAccessFile(testOutputFile, "rw").getChannel(); + + //Use the file channel to create a lock on the file. + // This method blocks until it can retrieve the lock. + + //FileLock lock = channel.lock(); + try{ + fw = new FileWriter(testOutputFile, true); + printErrors(response, messagesList, fw); + }finally{ + //lock.release(); + + // Close the file + //channel.close(); + fw.close(); + } + } else { + fw = new SystemOutWrapper(new ByteArrayOutputStream()); + printErrors(response, messagesList, fw); + } + } catch (Exception e) { + System.err.println(e.getLocalizedMessage()); + } + } + + private static class SystemOutWrapper extends OutputStreamWriter{ + public SystemOutWrapper(OutputStream out) { + super(out); + this.setWrapper(System.out); + } + + public void setWrapper(PrintStream out){ + writer = out; + } + + private PrintStream writer; + + public void write(String message){ + writer.println(message); + } + } +} Property changes on: trunk/framework/test/src/main/java/org/ajax4jsf/tests/TestFileUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -90,7 +90,7 @@ variables.setVariable("buttonIcon",buttonIcon); if(buttonLabel==null || buttonLabel.length()==0){ ]]> - </jsp:scriptlet> <img id="#{clientId}PopupButton" + </jsp:scriptlet> <img id="#{clientId}PopupButton" alt=" " class="rich-calendar-button #{component.attributes['buttonClass']}" accesskey="#{component.attributes['accesskey']}" style="vertical-align: middle" Modified: trunk/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -235,18 +235,18 @@ <table id="#{clientId}shadow" cellpadding="0" cellspacing="0" border="0"> <tr> <td class="rich-combobox-shadow-tl"> - <img src="#{spacer}" width="10" height="1" alt="" border="0"></img><br></br> + <img src="#{spacer}" width="10" height="1" alt=" " style="border:0"></img><br></br> </td> <td class="rich-combobox-shadow-tr"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"></img><br></br> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"></img><br></br> </td> </tr> <tr> <td class="rich-combobox-shadow-bl"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"></img><br></br> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"></img><br></br> </td> <td class="rich-combobox-shadow-br"> - <img src="#{spacer}" width="10" height="10" alt="" border="0"></img><br></br> + <img src="#{spacer}" width="10" height="10" alt=" " style="border:0"></img><br></br> </td> </tr> </table> Modified: trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java =================================================================== --- trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -170,6 +170,7 @@ } writer.startElement("script", component); + getUtils().writeAttribute(writer, "type", "text/javascript" ); writer.writeText("var contextMenu = new Richfaces.ContextMenu('", null); writer.writeText(component.getClientId(context), null); writer.writeText("', ", null); Modified: trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxStatusRendererTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxStatusRendererTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxStatusRendererTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -71,10 +71,12 @@ UIGraphic startImage = new UIGraphic(); startImage.setValue("start.png"); + startImage.getAttributes().put("alt", "alt"); status2.getFacets().put("start", startImage); UIGraphic stopGraphic = new UIGraphic(); stopGraphic.setValue("stop.png"); + stopGraphic.getAttributes().put("alt", "alt"); status2.getFacets().put("stop", stopGraphic); form.getChildren().add(status1); Modified: trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -63,6 +63,7 @@ media2.setId("media2"); media2.setElement("img"); media2.setUriAttribute("src"); + media2.getAttributes().put("alt", "Generated value"); form.getChildren().add(media2); media3 = (UIMediaOutput)application.createComponent(UIMediaOutput.COMPONENT_TYPE); Modified: trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx =================================================================== --- trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -38,7 +38,7 @@ </jsp:scriptlet> <div id="#{clientId}slider-track" class="track rich-dataFilterSlider-track #{component.trackStyleClass}" style="width:#{component.attributes['width']}"> <div id="#{clientId}slider-handle" class="handle rich-dataFilterSlider-handle #{component.handleStyleClass}"> - <img src="#{arrow}" width="7" height="8" alt="" border="0" /> + <img src="#{arrow}" width="7" height="8" alt=" " style="border:0" /> </div> </div> @@ -87,7 +87,7 @@ ]]> </jsp:scriptlet> - <script type="text/javascript" language="javascript"> + <script type="text/javascript"> #{this:renderSliderJs1(context, component)} Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -34,7 +34,7 @@ * */ public abstract class AbstractDefinitionListRenderer extends AbstractRowsRenderer { - + /* (non-Javadoc) * @see org.richfaces.renderkit.AbstractRowsRenderer#encodeOneRow(javax.faces.context.FacesContext, org.richfaces.renderkit.AbstractRowsRenderer.TableHolder) */ Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -728,6 +728,8 @@ writer.startElement(HTML.IMG_ELEMENT, column); writer.writeAttribute(HTML.src_ATTRIBUTE, imageUrl, null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, " ", + null); writer.writeAttribute(HTML.width_ATTRIBUTE, "15", null); writer .writeAttribute(HTML.height_ATTRIBUTE, "15", Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -145,7 +145,7 @@ public void testRenderDataList() throws Exception { // TYPE=disc|circle|square - dataList.getAttributes().put("type", "circle"); + dataList.getAttributes().put("style", "list-style:circle"); HtmlPage page = renderView(); assertNotNull(page); @@ -158,8 +158,7 @@ String classAttr = ul.getAttributeValue("class"); assertTrue(classAttr.contains("dr-list rich-datalist")); classAttr = ul.getAttributeValue("type"); - assertTrue(classAttr.contains((String) dataList.getAttributes().get( - "type"))); + List lis = ul.getHtmlElementsByTagName("li"); assertTrue(lis.size() > 0); Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -145,7 +145,7 @@ public void testRenderDataOrderedList() throws Exception { // TYPE=disc|circle|square - dataList.getAttributes().put("type", "circle"); + dataList.getAttributes().put("style", "list-style:circle"); HtmlPage page = renderView(); assertNotNull(page); @@ -158,8 +158,6 @@ String classAttr = ol.getAttributeValue("class"); assertTrue(classAttr.contains("dr-list rich-orderedlist")); classAttr = ol.getAttributeValue("type"); - assertTrue(classAttr.contains((String) dataList.getAttributes().get( - "type"))); List lis = ol.getHtmlElementsByTagName("li"); assertTrue(lis.size() > 0); Modified: trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx =================================================================== --- trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -62,7 +62,7 @@ ]]> </jsp:scriptlet> - <table id="#{clientId}_table" align="#{component.attributes['align']}" border="0" cellpadding="0" cellspacing="1" class="dr-dscr-t rich-dtascroller-table #{component.attributes['tableStyleClass']}"> + <table id="#{clientId}_table" style="text-align:#{component.attributes['align']}" border="0" cellpadding="0" cellspacing="1" class="dr-dscr-t rich-dtascroller-table #{component.attributes['tableStyleClass']}"> <tbody> <tr> <jsp:scriptlet><![CDATA[ Modified: trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx =================================================================== --- trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -106,7 +106,7 @@ <span id="#{clientId}" style="display:none"> - <script> + <script type="text/javascript"> new Richfaces.hotKey('#{clientId}','#{key}','#{selector}', #{options}, function(event) { #{attributes['handler']} }); </script> </span> Modified: trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx =================================================================== --- trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -121,18 +121,18 @@ <tbody> <tr> <td class="rich-inplace-shadow-tl"> - <img width="10" height="1" border="0" alt="" src="#{spacer}"/> + <img width="10" height="1" style="border:0" alt=" " src="#{spacer}"/> </td> <td class="rich-inplace-shadow-tr"> - <img width="1" height="10" border="0" alt="" src="#{spacer}"/> + <img width="1" height="10" style="border:0" alt=" " src="#{spacer}"/> </td> </tr> <tr> <td class="rich-inplace-shadow-bl"> - <img width="1" height="10" border="0" alt="" src="#{spacer}"/> + <img width="1" height="10" style="border:0" alt=" " src="#{spacer}"/> </td> <td class="rich-inplace-shadow-br"> - <img width="10" height="1" border="0" alt="" src="#{spacer}"/> + <img width="10" height="1" style="border:0" alt=" " src="#{spacer}"/> </td> </tr> </tbody> Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx =================================================================== --- trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -116,7 +116,7 @@ onmouseup='#{component.attributes["oninputmouseup"]}' /> - <input id="#{clientId}inselArrow" readonly="readonly" type="Text" value="" class="rich-inplace-select-arrow" style='display:none;'/> + <input id="#{clientId}inselArrow" readonly="readonly" type="text" value="" class="rich-inplace-select-arrow" style='display:none;'/> <input id='#{clientId}inplaceValue' name='#{clientId}' type='hidden' value='#{fieldValue}' onchange='#{component.attributes["onchange"]}'> </input> @@ -132,18 +132,18 @@ <table cellpadding="0" cellspacing="0" border="0" class="rich-inplace-select-shadow-size"> <tr> <td class="rich-inplace-select-shadow-tl"> - <img src="#{spacer}" width="10" height="1" alt="" border="0"/><br/> + <img src="#{spacer}" width="10" height="1" alt=" " style="border:0"/><br/> </td> <td class="rich-inplace-select-shadow-tr"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"/><br/> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"/><br/> </td> </tr> <tr> <td class="rich-inplace-select-shadow-bl"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"/><br/> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"/><br/> </td> <td class="rich-inplace-select-shadow-br"> - <img src="#{spacer}" width="10" height="1" alt="" border="0"/><br/> + <img src="#{spacer}" width="10" height="1" alt=" " style="border:0"/><br/> </td> </tr> </table> @@ -176,18 +176,18 @@ <table id="shadow#{clientId}" cellpadding="0" cellspacing="0" border="0" width="257" height="109"> <tr> <td class="rich-inplace-select-shadow-tl"> - <img src="#{spacer}" width="10" height="1" alt="" border="0"/><br/> + <img src="#{spacer}" width="10" height="1" alt=" " style="border:0"/><br/> </td> <td class="rich-inplace-select-shadow-tr"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"/><br/> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"/><br/> </td> </tr> <tr> <td class="rich-inplace-select-shadow-bl"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"/><br/> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"/><br/> </td> <td class="rich-inplace-select-shadow-br"> - <img src="#{spacer}" width="10" height="10" alt="" border="0"/><br/> + <img src="#{spacer}" width="10" height="10" alt=" " style="border:0"/><br/> </td> </tr> </table> Modified: trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx =================================================================== --- trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -176,7 +176,7 @@ <tbody> <tr> <td class="dr-insldr-track-decor-2"> - <img src="#{spacer}" style="display: block;" /> + <img src="#{spacer}" alt=" " style="display: block;" /> </td> </tr> </tbody> Modified: trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx =================================================================== --- trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -29,7 +29,7 @@ onmouseup="#{component.attributes['onmouseup']}"> <tbody> <tr> - <td width="1%" class="dr-spnr-e rich-spinner-input-container" id="#{clientId}Edit"> + <td style="width:1%" class="dr-spnr-e rich-spinner-input-container" id="#{clientId}Edit"> <jsp:scriptlet><![CDATA[ String autocomplete = "on"; boolean disableBrowserAutoComplete = getUtils().isBooleanAttribute(component, "disableBrowserAutoComplete"); @@ -80,7 +80,7 @@ type="image" src="#{up_arrow}" class="dr-spnr-bn rich-spinner-button" - border="0" + style="border:0" onclick="return false" onmousedown="this.className='dr-spnr-bp rich-spinner-button'" onmouseup="this.className='dr-spnr-bn rich-spinner-button'" @@ -93,7 +93,7 @@ type="image" src="#{up_arrow}" class="dr-spnr-bn rich-spinner-button" - border="0" + style="border:0" onclick="return false" tabindex="#{component.attributes['tabindex']}" /> <jsp:scriptlet><![CDATA[ @@ -106,12 +106,12 @@ <jsp:scriptlet><![CDATA[ if (! disabled) { ]]></jsp:scriptlet> - <input type="image" src="#{down_arrow}" class="dr-spnr-bn rich-spinner-button" border="0" onclick="return false" + <input type="image" src="#{down_arrow}" class="dr-spnr-bn rich-spinner-button" style="border:0" onclick="return false" onmousedown="this.className='dr-spnr-bp rich-spinner-button'" onmouseup="this.className='dr-spnr-bn rich-spinner-button'" onmouseout="this.className='dr-spnr-bn rich-spinner-button'" /> <jsp:scriptlet><![CDATA[ } else { ]]></jsp:scriptlet> - <input type="image" src="#{down_arrow}" class="dr-spnr-bn rich-spinner-button" border="0" onclick="return false" /> + <input type="image" src="#{down_arrow}" class="dr-spnr-bn rich-spinner-button" style="border:0" onclick="return false" /> <jsp:scriptlet><![CDATA[ } ]]></jsp:scriptlet> Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java =================================================================== --- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -177,6 +177,7 @@ writer.startElement(HTML.IMG_ELEMENT, table); writer.writeAttribute(HTML.src_ATTRIBUTE, getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context, null), null); writer.writeAttribute(HTML.style_ATTRIBUTE, "width:1px;height:1px;", null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, " ", null); writer.endElement(HTML.IMG_ELEMENT); renderChildren(context, component); Modified: trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx =================================================================== --- trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -41,13 +41,13 @@ renderChild(context, iconFacet); } else if (component.getAttributes().get(iconName)!=null) {]]> </jsp:scriptlet> - <img width="16" height="16" + <img width="16" height="16" alt=" " style="#{component.attributes['iconStyle']}" src="#{actualIcon}"/> <jsp:scriptlet> <![CDATA[} else {]]> </jsp:scriptlet> - <img width="16" height="16" + <img width="16" height="16" alt=" " style="#{component.attributes['iconStyle']}" src="#{spacer}"/> <jsp:scriptlet><![CDATA[}]]></jsp:scriptlet> @@ -76,7 +76,7 @@ <![CDATA[} else if (component.getAttributes().get(iconFolder)!=null) {]]> </jsp:scriptlet> <div id="#{clientId}:folder" class="dr-menu-node #{menuGroupItemFolderClass} #{component.attributes['iconClass']}"> - <img width="16" height="16" + <img width="16" height="16" alt=" " style="#{component.attributes['iconStyle']}" src="#{actualIconFolder}"/> </div> Modified: trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx =================================================================== --- trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -89,7 +89,7 @@ } else { ]]></jsp:scriptlet> - <img width="16" + <img width="16" alt=" " height="16" src="#{icon}" /> Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -182,6 +182,7 @@ writer.startElement(HTML.IMG_ELEMENT, table); writer.writeAttribute(HTML.src_ATTRIBUTE, getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context, null), null); writer.writeAttribute(HTML.style_ATTRIBUTE, "width:1px;height:1px;", null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, " ", null); writer.endElement(HTML.IMG_ELEMENT); renderChildren(context, component); Modified: trunk/ui/paint2D/src/main/config/component/paint2D.xml =================================================================== --- trunk/ui/paint2D/src/main/config/component/paint2D.xml 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/paint2D/src/main/config/component/paint2D.xml 2008-10-15 09:52:22 UTC (rev 10761) @@ -104,6 +104,13 @@ Also note, that several browsers (e.g. IE6) do not support PNG transparency]]></description> <defaultvalue>"transparent"</defaultvalue> </property> + <property> + <name>alt</name> + <classname>java.lang.String</classname> + <description><![CDATA[ + For compability with XHTML 1.1 standart]]></description> + <defaultvalue>" "</defaultvalue> + </property> <property hidden="true"> <name>dir</name> <classname>java.lang.String</classname> Modified: trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java =================================================================== --- trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -74,11 +74,11 @@ p2d = (UIPaint2D) application.createComponent(UIPaint2D.COMPONENT_TYPE); assertNotNull(p2d); p2d.setId("p2d"); - p2d.setBgcolor("pink"); + //p2d.setBgcolor("pink"); p2d.setHeight(300); p2d.setWidth(200); - p2d.getAttributes().put("align", "left"); - p2d.getAttributes().put("border", "5"); + //p2d.getAttributes().put("align", "left"); + p2d.getAttributes().put("style","border:5;align:left"); p2d.getAttributes().put("title", "title goes here"); // p2d.setCacheable(true); form.getChildren().add(p2d); @@ -113,14 +113,14 @@ str = htmlP2D.getAttributeValue("height"); assertEquals(str, "300"); - str = htmlP2D.getAttributeValue("bgcolor"); - assertEquals(str, "pink"); + //str = htmlP2D.getAttributeValue("bgcolor"); + //assertEquals(str, "pink"); - str = htmlP2D.getAttributeValue("align"); - assertEquals(str, "left"); + //str = htmlP2D.getAttributeValue("align"); + //assertEquals(str, "left"); - str = htmlP2D.getAttributeValue("border"); - assertEquals(str, "5"); + //str = htmlP2D.getAttributeValue("border"); + //assertEquals(str, "5"); str = htmlP2D.getAttributeValue("title"); assertEquals(str, "title goes here"); Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -66,7 +66,7 @@ for (int i=0;i<level;i++){ writer.startElement("img", component); writer.writeAttribute("src", src, null); - writer.writeAttribute("alt", "", null); + writer.writeAttribute("alt", " ", null); writer.writeAttribute("hspace", "0", null); writer.writeAttribute("vspace", "0", null); writer.writeAttribute("height", String.valueOf(w), null); @@ -278,7 +278,7 @@ writer.writeAttribute("style", "display: none;", null); } writer.writeAttribute("src", imageSrc, null); - writer.writeAttribute("alt", "", null); + writer.writeAttribute("alt", " ", null); writer.writeAttribute("vspace", "0", null); writer.writeAttribute("hspace", "0", null); writer.writeAttribute("width", String.valueOf(h), null); Modified: trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java =================================================================== --- trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -228,6 +228,7 @@ protected void encodeSpacer(FacesContext context, UIComponent component, ResponseWriter writer) throws IOException { writer.startElement(HTML.IMG_ELEMENT, component); writer.writeAttribute(HTML.src_ATTRIBUTE, getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context, null), null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, " ", null); writer.writeAttribute(HTML.style_ATTRIBUTE, "width:1px;height:1px;", null); writer.endElement(HTML.IMG_ELEMENT); } @@ -383,7 +384,7 @@ protected void renderDefaultControl(FacesContext context, UIComponent component, ResponseWriter writer, OrderingComponentRendererBase.ControlsHelper helper, String clientId, boolean enabled, String baseStyle, String baseControlStyle) throws IOException { - UIComponent facet = component.getFacet(helper.getFacetName()); + UIComponent facet = component.getFacet(getAltAttribbute(helper)); boolean useFacet = (facet != null && facet.isRendered()); String customEvent = null; @@ -454,7 +455,7 @@ } else { writer.startElement(HTML.IMG_ELEMENT, component); writer.writeAttribute(HTML.class_ATTRIBUTE, "rich-picklist-control-img", null); - writer.writeAttribute(HTML.alt_ATTRIBUTE, helper.getFacetName(), null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, getAltAttribbute(helper), null); writer.writeAttribute(HTML.src_ATTRIBUTE, getResource(helper.getImageURI()).getUri(context, null), null); writer.endElement(HTML.IMG_ELEMENT); @@ -480,6 +481,11 @@ } writer.endElement(HTML.DIV_ELEM); } + + private String getAltAttribbute( + OrderingComponentRendererBase.ControlsHelper helper) { + return helper.getFacetName()!=null?helper.getFacetName():" "; + } public void reRenderScript(FacesContext context, UIComponent component) throws IOException { AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); Modified: trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -60,6 +60,7 @@ private UISimpleTogglePanel stp1; private UISimpleTogglePanel stp2; private UIForm form; + private UIForm form2; private UIOutput openMarker1; private UIOutput closeMarker1; private UIOutput openMarker2; @@ -84,7 +85,10 @@ form = new HtmlForm(); form.setId("form"); + form2 = new HtmlForm(); + form2.setId("form2"); facesContext.getViewRoot().getChildren().add(form); + facesContext.getViewRoot().getChildren().add(form2); stp1 = (UISimpleTogglePanel)application.createComponent("org.richfaces.SimpleTogglePanel"); stp1.setId("simpleTogglePanel1"); @@ -118,7 +122,7 @@ stp2.getFacets().put(openMarker2.getId(), openMarker2); stp2.getFacets().put(closeMarker2.getId(), closeMarker2); - form.getChildren().add(stp2); + form2.getChildren().add(stp2); input = (UIInput)application.createComponent(UIInput.COMPONENT_TYPE); input.setValue(""); @@ -138,6 +142,7 @@ stp1 = null; stp2 = null; form = null; + form2 = null; openMarker1 = null; closeMarker1 = null; openMarker2 = null; @@ -223,6 +228,7 @@ public void testRenderScript() throws Exception { HtmlPage page = renderView(); assertNotNull(page); + assertNotNull(page); assertEquals(getCountValidScripts(page, javaScripts, IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size()); } Modified: trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java =================================================================== --- trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -69,6 +69,7 @@ spacer.setId("spacer"); spacer.getAttributes().put("width", "30"); spacer.getAttributes().put("height", "10"); + spacer.getAttributes().put("title", "10"); spacer.getAttributes().put("style", "background-color: lime"); // spacer.getAttributes().put("height", new Integer(10)); Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java =================================================================== --- trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -275,6 +275,7 @@ writer.writeAttribute("id", component.getClientId(context) + "_script", null); writer.writeAttribute("style", "display:none;", null); writer.startElement(HTML.SCRIPT_ELEM, component); + writer.writeAttribute("type", "text/javascript", null); writer.writeText(getScript(context, component), "script"); writer.endElement(HTML.SCRIPT_ELEM); writer.endElement(HTML.DIV_ELEM); Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -364,7 +364,7 @@ prevTab = tab; } - + // Store flag for exist client-side tabs. componentVariables.setVariable("clientSide", new Boolean(clientSide)); componentVariables.setVariable("tabs", tabs); Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -52,7 +52,7 @@ this.width = 1; this.height = 200; - + setRenderer(new GifRenderer()); setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); } Modified: trunk/ui/tabPanel/src/main/templates/tab.jspx =================================================================== --- trunk/ui/tabPanel/src/main/templates/tab.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/main/templates/tab.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -13,8 +13,8 @@ <f:clientid var="clientId"/> - <td id="#{clientId}" style="#{this:getTabDisplay(context, component)}" - height="100%"> + <td id="#{clientId}" style="#{this:getTabDisplay(context, component)};height:100%" + > <table border="0" cellpadding="10" cellspacing="0" width="100%" class="dr-tbpnl-cntnt-pstn rich-tabpanel-content-position" style=""> <tr> Modified: trunk/ui/tabPanel/src/main/templates/tabHeader.jspx =================================================================== --- trunk/ui/tabPanel/src/main/templates/tabHeader.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/main/templates/tabHeader.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -20,7 +20,7 @@ <f:call name="encodeTabLabel" /> <tr> - <td class="dr-tbpnl-tbbrdr rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt="" border="0" /></td> + <td class="dr-tbpnl-tbbrdr rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt=" " style="border:0" /></td> <td class="dr-tbpnl-tbtopbrdr rich-tabhdr-side-cell" style="#{this:encodeTabLabelWidth(context, component)}"> <table style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0" > <tr> @@ -40,12 +40,12 @@ </tr> </table> </td> - <td class="dr-tbpnl-tbbrdr rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt="" border="0" /></td> + <td class="dr-tbpnl-tbbrdr rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt=" " style="border:0" /></td> </tr> </table> </td> - <td><img src="#{spacer}" height="1" alt="" border="0" style="#{this:encodeHeaderSpacing(context, component)}"/></td> + <td><img src="#{spacer}" height="1" alt=" " style="#{this:encodeHeaderSpacing(context, component)};border:0"/></td> </f:root> Modified: trunk/ui/tabPanel/src/main/templates/tabPanel.jspx =================================================================== --- trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -43,8 +43,8 @@ <td> - <img src="#{spacer}" height="1" alt="" - border="0" style="#{this:encodeHeaderSpacing(context, component)}" /> + <img src="#{spacer}" height="1" alt=" " + style="#{this:encodeHeaderSpacing(context, component)};border:0" /> </td> <f:call name="encodeTabs" /> Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java =================================================================== --- trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -94,7 +94,7 @@ tab2.setActive(false); tabPanel.getChildren().add(tab2); } - + /* (non-Javadoc) * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() */ Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -110,7 +110,7 @@ } writer.startElement(HTML.td_ELEM, component); - writer.writeAttribute(HTML.width_ATTRIBUTE, "100%", null); + writer.writeAttribute(HTML.style_ATTRIBUTE, "width:100%", null); writer.endElement(HTML.td_ELEM); for (Iterator<UIComponent> it = childrenToTheRight.iterator(); it.hasNext();) { @@ -178,7 +178,7 @@ getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, component.getAttributes().get("separatorClass")); writer.startElement(HTML.IMG_ELEMENT, component); getUtils().writeAttribute(writer, HTML.src_ATTRIBUTE, uri); - getUtils().writeAttribute(writer, HTML.alt_ATTRIBUTE, ""); + getUtils().writeAttribute(writer, HTML.alt_ATTRIBUTE, " "); writer.endElement(HTML.IMG_ELEMENT); writer.endElement(HTML.td_ELEM); } Modified: trunk/ui/tree/src/main/templates/htmlTreeNode.jspx =================================================================== --- trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -60,7 +60,7 @@ if (leaf) { ]]> </jsp:scriptlet> - <img id="#{clientId}:handle:img" src="#{spacer}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> + <img id="#{clientId}:handle:img" src="#{spacer}" alt=" " class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> <jsp:scriptlet> <![CDATA[ } else { @@ -91,9 +91,9 @@ ]]> </jsp:scriptlet> - <img border="0" id="#{clientId}:handle:img:collapsed" + <img id="#{clientId}:handle:img:collapsed" src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img rich-tree-node-handleicon-collapsed" - style="#{this:getHandleCollapsedDisplayStyle(context, component)}" alt="" /> + style="#{this:getHandleCollapsedDisplayStyle(context, component)};border:0" alt=" " /> <jsp:scriptlet> <![CDATA[ @@ -123,9 +123,9 @@ } else { ]]> </jsp:scriptlet> - <img border="0" id="#{clientId}:handle:img:expanded" src="#{expanded}" - style="#{this:getHandleExpandedDisplayStyle(context, component)}" - class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img rich-tree-node-handleicon-expanded" alt="" /> + <img id="#{clientId}:handle:img:expanded" src="#{expanded}" + style="#{this:getHandleExpandedDisplayStyle(context, component)};border:0" + class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img rich-tree-node-handleicon-expanded" alt=" " /> <jsp:scriptlet> <![CDATA[ } @@ -196,7 +196,7 @@ } else { ]]> </jsp:scriptlet> - <img src="#{leaf}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> + <img src="#{leaf}" alt=" " class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> <jsp:scriptlet> <![CDATA[ } @@ -221,7 +221,7 @@ } else { ]]> </jsp:scriptlet> - <img src="#{folder}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> + <img src="#{folder}" alt=" " class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> <jsp:scriptlet> <![CDATA[ }

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r10760 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces and 1 other directories.

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

Author: andrei_exadel Date: 2008-10-15 05:46:40 -0400 (Wed, 15 Oct 2008) New Revision: 10760 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/ajaxCommandLinkAutoTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumEvent.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java Log: AJAX command Link: test HTML attrs & events Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/ajaxCommandLinkAutoTest.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/ajaxCommandLinkAutoTest.xhtml 2008-10-15 09:39:01 UTC (rev 10759) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/ajaxCommandLinkAutoTest.xhtml 2008-10-15 09:46:40 UTC (rev 10760) @@ -18,6 +18,17 @@ rendered="#{autoTestBean.rendered}" oncomplete="#{autoTestBean.oncomplete}" value="Link" + styleClass="noname" + style="color: blue; text-decoration: underline;" + onclick="EventQueue.fire('onclick')" + onkeydown="EventQueue.fire('onkeydown')" + onkeypress="EventQueue.fire('onkeypress')" + onkeyup="EventQueue.fire('onkeyup')" + onmousedown="EventQueue.fire('onmousedown')" + onmousemove="EventQueue.fire('onmousemove')" + onmouseout="EventQueue.fire('onmouseout')" + onmouseover="EventQueue.fire('onmouseover')" + onmouseup="EventQueue.fire('onmouseup')" > <f:param name="parameter1" value="value1" /> <f:param name="parameter2" value="value2" /> Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2008-10-15 09:39:01 UTC (rev 10759) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2008-10-15 09:46:40 UTC (rev 10760) @@ -197,6 +197,21 @@ } + public void testStyleAndClasses(String [] classNames, Map<String, String> styleAttr) { + reset(); + clickLoad(); + + String componentId = getClientId(COMPONENT_ID); + + base.assertClassNames(componentId, classNames, "Component's rendering invalid", true); + base.assertStyleAttributes(componentId, styleAttr); + } + + public void testHTMLEvents() { + String componentId = getClientId(COMPONENT_ID); + base.assertEvents(componentId, SeleniumEvent.STANDARD_HTML_EVENTS); + } + private void checkComponentReRendered() { if (base.getReRendersId() == null) { return; Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumEvent.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumEvent.java 2008-10-15 09:39:01 UTC (rev 10759) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumEvent.java 2008-10-15 09:46:40 UTC (rev 10760) @@ -1,5 +1,8 @@ package org.richfaces; +import java.util.ArrayList; +import java.util.List; + public enum SeleniumEvent { ONCLICK("onclick"), @@ -16,6 +19,20 @@ private String name; + public static final List<SeleniumEvent> STANDARD_HTML_EVENTS = new ArrayList<SeleniumEvent>(); + static { + STANDARD_HTML_EVENTS.add(ONCLICK); + STANDARD_HTML_EVENTS.add(ONMOUSEOVER); + STANDARD_HTML_EVENTS.add(ONMOUSEMOVE); + STANDARD_HTML_EVENTS.add(ONMOUSEOUT); + STANDARD_HTML_EVENTS.add(ONMOUSEDOWN); + STANDARD_HTML_EVENTS.add(ONMOUSEUP); + STANDARD_HTML_EVENTS.add(ONKEYDOWN); + STANDARD_HTML_EVENTS.add(ONKEYUP); + STANDARD_HTML_EVENTS.add(ONKEYPRESS); + + } + private SeleniumEvent(String name) { this.name = name; } @@ -23,5 +40,10 @@ public String getName() { return name; } + + @Override + public String toString() { + return name; + } } Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-15 09:39:01 UTC (rev 10759) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-15 09:46:40 UTC (rev 10760) @@ -1063,6 +1063,48 @@ } eventsExpected.clear(); } + + public Object assertEvents(String id, List<SeleniumEvent> eventsExpected) { + + for (SeleniumEvent ev : eventsExpected) { + if (ev == SeleniumEvent.ONCLICK) { + clickById(id); + }else if (ev == SeleniumEvent.ONDBCLICK) { + selenium.doubleClick(id); + } else if (ev == SeleniumEvent.ONMOUSEDOWN) { + selenium.mouseDown(id); + }else if (ev == SeleniumEvent.ONMOUSEMOVE) { + selenium.mouseMove(id); + }else if (ev == SeleniumEvent.ONMOUSEUP) { + selenium.mouseUp(id); + }else if (ev == SeleniumEvent.ONMOUSEOVER) { + selenium.mouseOver(id); + }else if (ev == SeleniumEvent.ONMOUSEOUT) { + selenium.mouseOut(id); + }else if (ev == SeleniumEvent.ONKEYDOWN) { + selenium.keyDown(id, "a"); + }else if (ev == SeleniumEvent.ONKEYUP) { + selenium.keyUp(id, "a"); + }else if (ev == SeleniumEvent.ONKEYPRESS) { + selenium.keyPress(id, "a"); + } + + } + + StringBuilder sb = new StringBuilder(); + String delim = ""; + for (SeleniumEvent event : eventsExpected) { + sb.append(delim).append("'").append(event).append("'"); + delim = ","; + } + String json = "[" + sb.toString() + "]"; + String message = runScript("EventQueue.assert(eval(\"" + json + "\"))"); + if (null != message && message.length() > 0) { + Assert.fail(message); + } + eventsExpected.clear(); + return null; + } public void autoTest(Template template, String component, List<SeleniumEvent> events, Map<String , String> attributes) { selenium.open(protocol + "://" + host + ":" + port + "/" + APPLICATION_NAME + filterPrefix + "/pages/_autotest/autotestsetup.xhtml"); @@ -1139,4 +1181,17 @@ public String getHTMLById(String id) { return runScript(getElementById(id) + ".innerHTML"); } + + public String getStyleAttributeString (String id, String attr) { + return runScript(getElementById(id) + ".getStyle('" + attr + "')"); + + } + + public void assertStyleAttributes(String id, Map<String, String> styleAttrs) { + for (String a : styleAttrs.keySet()) { + String actualStyle = getStyleAttributeString(id, a); + Assert.assertEquals(actualStyle, styleAttrs.get(a), "Style attribute invalid. Expected ["+styleAttrs.get(a)+"]. But was ["+actualStyle+"]"); + } + + } } Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java 2008-10-15 09:39:01 UTC (rev 10759) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java 2008-10-15 09:46:40 UTC (rev 10760) @@ -13,13 +13,28 @@ public class AjaxCommandLinkTest extends SeleniumTestBase { private static Map<String, String> parameter = new HashMap<String, String>(); + private static Map<String, String> styleAttributes = new HashMap<String, String>(); static { parameter.put("parameter1", "value1"); parameter.put("parameter2", "value2"); parameter.put("parameter3", "value3"); + + styleAttributes.put("color", "blue"); + styleAttributes.put("text-decoration", "underline"); + } @Test + public void testHTMLAttributes(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, null); + + tester.testStyleAndClasses(new String [] {"noname"}, styleAttributes); + tester.testHTMLEvents(); + + } + + @Test public void testReRender(Template template) { AutoTester tester = getAutoTester(this); tester.renderPage(template, null);

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r10759 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.

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

Author: dsvyatobatsko Date: 2008-10-15 05:39:01 -0400 (Wed, 15 Oct 2008) New Revision: 10759 Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanelAutoTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanelTest.xhtml Removed: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java Log: SimpleTogglePanel test Deleted: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanelAutoTest.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanelAutoTest.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Copied: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanelTest.xhtml (from rev 10754, trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml) =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java 2008-10-15 09:35:34 UTC (rev 10758) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java 2008-10-15 09:39:01 UTC (rev 10759) @@ -21,15 +21,27 @@ package org.richfaces.testng; +import java.util.HashMap; +import java.util.Map; + import org.ajax4jsf.template.Template; +import org.richfaces.AutoTester; import org.richfaces.SeleniumTestBase; import org.testng.Assert; import org.testng.annotations.Test; public class SimpleTogglePanelTest extends SeleniumTestBase { + private static Map<String, String> params = new HashMap<String, String>(); + + static { + params.put("parameter1", "value1"); + params.put("parameter2", "value2"); + params.put("parameter3", "value3"); + } + @Test - public void _testSimpleTogglePanelComponent(Template template) { + public void testSimpleTogglePanelComponent(Template template) { renderPage(template); String parentId = getParentId() + "_form:"; String inputId = parentId + "_value"; @@ -77,8 +89,59 @@ Assert.assertFalse(isVisibleById(serverBody)); } + @Test + public void testRenderedAttribute(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, null); + writeStatus("Test component with rendered = false is not present on the page"); + tester.testRendered(); + } + + @Test + public void testReRenderAttribute(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, null); + writeStatus("Test component re-renders another components"); + tester.testReRender(); + } + + @Test + public void testLimitToListAttribute(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, null); + writeStatus("Test component with limitToList = true skips ajaxRendered areas update"); + tester.testLimitToList(); + } + + @Test + public void testBypassUpdatesAttribute(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, null); + writeStatus("Test component with bypassUpdates = true skips update model values phase"); + tester.testBypassUpdate(); + } + + @Test + public void testNestedParams(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, null); + writeStatus("Test component encodes nested f:param tags and their values are present as request parameters"); + tester.testRequestParameters(params); + } + + @Override + public void sendAjax() { + clickAjaxCommandAndWait(getAutoTester(this).getClientId(AutoTester.COMPONENT_ID) + "_header"); + } + + @Override + public String getAutoTestUrl() { + return "pages/simpleTogglePanel/simpleTogglePanelAutoTest.xhtml"; + } + + @Override public String getTestUrl() { - return "pages/simpleTogglePanel/simpleTogglePanel.xhtml"; + return "pages/simpleTogglePanel/simpleTogglePanelTest.xhtml"; } }

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r10758 - in trunk/sandbox/ui/editor: src/main/config/resources and 3 other directories.

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

Author: alevkovsky Date: 2008-10-15 05:35:34 -0400 (Wed, 15 Oct 2008) New Revision: 10758 Removed: trunk/sandbox/ui/editor/src/main/java/org/richfaces/component/TinyMceLoaderServlet.java Modified: trunk/sandbox/ui/editor/pom.xml trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js trunk/sandbox/ui/editor/src/main/templates/editor.jspx Log: Adjust resources-config and editor template for tiny scripts loading Modified: trunk/sandbox/ui/editor/pom.xml =================================================================== --- trunk/sandbox/ui/editor/pom.xml 2008-10-15 09:35:26 UTC (rev 10757) +++ trunk/sandbox/ui/editor/pom.xml 2008-10-15 09:35:34 UTC (rev 10758) @@ -55,7 +55,7 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> - <version>2.0.2.GA</version> + <version>2.1.0.CR1</version> <scope>provided</scope> </dependency> </dependencies> Modified: trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml =================================================================== --- trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml 2008-10-15 09:35:26 UTC (rev 10757) +++ trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml 2008-10-15 09:35:34 UTC (rev 10758) @@ -1,1092 +1,1092 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <resource-config> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/langs/en.js</name> + <name>scripts/tiny_mce/langs/en.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/langs/en.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/license.txt</name> + <name>scripts/tiny_mce/license.txt</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/license.txt</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/css/advhr.css</name> + <name>scripts/tiny_mce/plugins/advhr/css/advhr.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/css/advhr.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/advhr/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/advhr/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/js/rule.js</name> + <name>scripts/tiny_mce/plugins/advhr/js/rule.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/js/rule.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/advhr/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/rule.htm</name> + <name>scripts/tiny_mce/plugins/advhr/rule.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/rule.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/css/advimage.css</name> + <name>scripts/tiny_mce/plugins/advimage/css/advimage.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/css/advimage.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/advimage/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/advimage/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/image.htm</name> + <name>scripts/tiny_mce/plugins/advimage/image.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/image.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/img/sample.gif</name> + <name>scripts/tiny_mce/plugins/advimage/img/sample.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/img/sample.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/js/image.js</name> + <name>scripts/tiny_mce/plugins/advimage/js/image.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/js/image.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/advimage/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/css/advlink.css</name> + <name>scripts/tiny_mce/plugins/advlink/css/advlink.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/css/advlink.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/advlink/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/advlink/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/js/advlink.js</name> + <name>scripts/tiny_mce/plugins/advlink/js/advlink.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/js/advlink.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/advlink/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/link.htm</name> + <name>scripts/tiny_mce/plugins/advlink/link.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/link.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/autosave/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/autosave/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/autosave/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/autosave/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/autosave/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/autosave/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/bbcode/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/bbcode/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/bbcode/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/bbcode/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/bbcode/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/bbcode/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/compat2x/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/compat2x/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/compat2x/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/compat2x/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/compat2x/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/compat2x/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/contextmenu/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/contextmenu/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/contextmenu/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/directionality/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/directionality/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/directionality/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/directionality/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/directionality/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/directionality/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/emotions/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/emotions/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/emotions.htm</name> + <name>scripts/tiny_mce/plugins/emotions/emotions.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/emotions.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-cool.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-cool.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-cool.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-cry.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-cry.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-cry.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-frown.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-frown.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-frown.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-smile.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-smile.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-smile.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-wink.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-wink.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-wink.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-yell.gif</name> + <name>scripts/tiny_mce/plugins/emotions/img/smiley-yell.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/img/smiley-yell.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/js/emotions.js</name> + <name>scripts/tiny_mce/plugins/emotions/js/emotions.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/js/emotions.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/emotions/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/dialog.htm</name> + <name>scripts/tiny_mce/plugins/example/dialog.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/dialog.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/example/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/example/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/img/example.gif</name> + <name>scripts/tiny_mce/plugins/example/img/example.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/img/example.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/js/dialog.js</name> + <name>scripts/tiny_mce/plugins/example/js/dialog.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/js/dialog.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/langs/en.js</name> + <name>scripts/tiny_mce/plugins/example/langs/en.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/langs/en.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/example/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/css/fullpage.css</name> + <name>scripts/tiny_mce/plugins/fullpage/css/fullpage.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/css/fullpage.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/fullpage/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/fullpage/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/fullpage.htm</name> + <name>scripts/tiny_mce/plugins/fullpage/fullpage.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/fullpage.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/js/fullpage.js</name> + <name>scripts/tiny_mce/plugins/fullpage/js/fullpage.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/js/fullpage.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/fullpage/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullscreen/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/fullscreen/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullscreen/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullscreen/fullscreen.htm</name> + <name>scripts/tiny_mce/plugins/fullscreen/fullscreen.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullscreen/fullscreen.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/iespell/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/iespell/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/iespell/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/iespell/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/iespell/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/iespell/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/inlinepopups/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif</name> + <name>scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif</name> + <name>scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif</name> + <name>scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif</name> + <name>scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif</name> + <name>scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif</name> + <name>scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif</name> + <name>scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css</name> + <name>scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/template.htm</name> + <name>scripts/tiny_mce/plugins/inlinepopups/template.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/template.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/insertdatetime/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/insertdatetime/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/insertdatetime/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/layer/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/layer/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/layer/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/layer/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/layer/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/layer/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/css/content.css</name> + <name>scripts/tiny_mce/plugins/media/css/content.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/css/content.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/css/media.css</name> + <name>scripts/tiny_mce/plugins/media/css/media.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/css/media.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/media/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/media/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/flash.gif</name> + <name>scripts/tiny_mce/plugins/media/img/flash.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/flash.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/flv_player.swf</name> + <name>scripts/tiny_mce/plugins/media/img/flv_player.swf</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/flv_player.swf</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/quicktime.gif</name> + <name>scripts/tiny_mce/plugins/media/img/quicktime.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/quicktime.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/realmedia.gif</name> + <name>scripts/tiny_mce/plugins/media/img/realmedia.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/realmedia.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/shockwave.gif</name> + <name>scripts/tiny_mce/plugins/media/img/shockwave.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/shockwave.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/trans.gif</name> + <name>scripts/tiny_mce/plugins/media/img/trans.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/trans.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/windowsmedia.gif</name> + <name>scripts/tiny_mce/plugins/media/img/windowsmedia.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/windowsmedia.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/js/embed.js</name> + <name>scripts/tiny_mce/plugins/media/js/embed.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/js/embed.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/js/media.js</name> + <name>scripts/tiny_mce/plugins/media/js/media.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/js/media.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/media/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/media.htm</name> + <name>scripts/tiny_mce/plugins/media/media.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/media.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/nonbreaking/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/nonbreaking/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/nonbreaking/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/noneditable/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/noneditable/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/noneditable/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/noneditable/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/noneditable/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/noneditable/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/css/content.css</name> + <name>scripts/tiny_mce/plugins/pagebreak/css/content.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/css/content.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/pagebreak/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif</name> + <name>scripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/img/trans.gif</name> + <name>scripts/tiny_mce/plugins/pagebreak/img/trans.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/img/trans.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/blank.htm</name> + <name>scripts/tiny_mce/plugins/paste/blank.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/blank.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/css/blank.css</name> + <name>scripts/tiny_mce/plugins/paste/css/blank.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/css/blank.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/css/pasteword.css</name> + <name>scripts/tiny_mce/plugins/paste/css/pasteword.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/css/pasteword.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/paste/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/paste/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/js/pastetext.js</name> + <name>scripts/tiny_mce/plugins/paste/js/pastetext.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/js/pastetext.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/js/pasteword.js</name> + <name>scripts/tiny_mce/plugins/paste/js/pasteword.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/js/pasteword.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/paste/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/pastetext.htm</name> + <name>scripts/tiny_mce/plugins/paste/pastetext.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/pastetext.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/pasteword.htm</name> + <name>scripts/tiny_mce/plugins/paste/pasteword.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/pasteword.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/preview/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/preview/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/example.html</name> + <name>scripts/tiny_mce/plugins/preview/example.html</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/example.html</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/jscripts/embed.js</name> + <name>scripts/tiny_mce/plugins/preview/jscripts/embed.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/jscripts/embed.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/preview.html</name> + <name>scripts/tiny_mce/plugins/preview/preview.html</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/preview.html</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/print/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/print/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/print/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/print/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/print/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/print/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/safari/blank.htm</name> + <name>scripts/tiny_mce/plugins/safari/blank.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/safari/blank.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/safari/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/safari/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/safari/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/safari/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/safari/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/safari/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/save/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/save/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/save/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/save/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/save/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/save/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/css/searchreplace.css</name> + <name>scripts/tiny_mce/plugins/searchreplace/css/searchreplace.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/css/searchreplace.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/searchreplace/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/js/searchreplace.js</name> + <name>scripts/tiny_mce/plugins/searchreplace/js/searchreplace.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/js/searchreplace.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/searchreplace.htm</name> + <name>scripts/tiny_mce/plugins/searchreplace/searchreplace.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/searchreplace.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/spellchecker/css/content.css</name> + <name>scripts/tiny_mce/plugins/spellchecker/css/content.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/spellchecker/css/content.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/spellchecker/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/spellchecker/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/spellchecker/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/spellchecker/img/wline.gif</name> + <name>scripts/tiny_mce/plugins/spellchecker/img/wline.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/spellchecker/img/wline.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/css/props.css</name> + <name>scripts/tiny_mce/plugins/style/css/props.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/css/props.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/style/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/style/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/js/props.js</name> + <name>scripts/tiny_mce/plugins/style/js/props.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/js/props.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/style/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/props.htm</name> + <name>scripts/tiny_mce/plugins/style/props.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/props.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/cell.htm</name> + <name>scripts/tiny_mce/plugins/table/cell.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/cell.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/css/cell.css</name> + <name>scripts/tiny_mce/plugins/table/css/cell.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/css/cell.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/css/row.css</name> + <name>scripts/tiny_mce/plugins/table/css/row.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/css/row.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/css/table.css</name> + <name>scripts/tiny_mce/plugins/table/css/table.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/css/table.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/table/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/table/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/js/cell.js</name> + <name>scripts/tiny_mce/plugins/table/js/cell.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/js/cell.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/js/merge_cells.js</name> + <name>scripts/tiny_mce/plugins/table/js/merge_cells.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/js/merge_cells.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/js/row.js</name> + <name>scripts/tiny_mce/plugins/table/js/row.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/js/row.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/js/table.js</name> + <name>scripts/tiny_mce/plugins/table/js/table.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/js/table.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/table/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/merge_cells.htm</name> + <name>scripts/tiny_mce/plugins/table/merge_cells.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/merge_cells.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/row.htm</name> + <name>scripts/tiny_mce/plugins/table/row.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/row.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/table.htm</name> + <name>scripts/tiny_mce/plugins/table/table.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/table.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/blank.htm</name> + <name>scripts/tiny_mce/plugins/template/blank.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/blank.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/css/template.css</name> + <name>scripts/tiny_mce/plugins/template/css/template.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/css/template.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/template/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/template/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/js/template.js</name> + <name>scripts/tiny_mce/plugins/template/js/template.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/js/template.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/template/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/template.htm</name> + <name>scripts/tiny_mce/plugins/template/template.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/template.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/visualchars/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/visualchars/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/visualchars/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/visualchars/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/visualchars/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/visualchars/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/abbr.htm</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/abbr.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/abbr.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/acronym.htm</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/acronym.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/acronym.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/attributes.htm</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/attributes.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/attributes.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/cite.htm</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/cite.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/cite.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/css/popup.css</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/css/popup.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/css/popup.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/del.htm</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/del.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/del.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/ins.htm</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/ins.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/ins.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/cite.js</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/js/cite.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/cite.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/del.js</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/js/del.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/del.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/ins.js</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/js/ins.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/js/ins.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js</name> + <name>scripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/about.htm</name> + <name>scripts/tiny_mce/themes/advanced/about.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/about.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/anchor.htm</name> + <name>scripts/tiny_mce/themes/advanced/anchor.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/anchor.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/charmap.htm</name> + <name>scripts/tiny_mce/themes/advanced/charmap.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/charmap.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/color_picker.htm</name> + <name>scripts/tiny_mce/themes/advanced/color_picker.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/color_picker.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/editor_template.js</name> + <name>scripts/tiny_mce/themes/advanced/editor_template.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/editor_template.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/editor_template_src.js</name> + <name>scripts/tiny_mce/themes/advanced/editor_template_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/editor_template_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/image.htm</name> + <name>scripts/tiny_mce/themes/advanced/image.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/image.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/img/colorpicker.jpg</name> + <name>scripts/tiny_mce/themes/advanced/img/colorpicker.jpg</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/img/colorpicker.jpg</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/img/icons.gif</name> + <name>scripts/tiny_mce/themes/advanced/img/icons.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/img/icons.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/about.js</name> + <name>scripts/tiny_mce/themes/advanced/js/about.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/about.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/anchor.js</name> + <name>scripts/tiny_mce/themes/advanced/js/anchor.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/anchor.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/charmap.js</name> + <name>scripts/tiny_mce/themes/advanced/js/charmap.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/charmap.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/color_picker.js</name> + <name>scripts/tiny_mce/themes/advanced/js/color_picker.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/color_picker.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/image.js</name> + <name>scripts/tiny_mce/themes/advanced/js/image.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/image.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/link.js</name> + <name>scripts/tiny_mce/themes/advanced/js/link.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/link.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/source_editor.js</name> + <name>scripts/tiny_mce/themes/advanced/js/source_editor.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/js/source_editor.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/langs/en.js</name> + <name>scripts/tiny_mce/themes/advanced/langs/en.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/langs/en.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/langs/en_dlg.js</name> + <name>scripts/tiny_mce/themes/advanced/langs/en_dlg.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/langs/en_dlg.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/link.htm</name> + <name>scripts/tiny_mce/themes/advanced/link.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/link.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/content.css</name> + <name>scripts/tiny_mce/themes/advanced/skins/default/content.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/content.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/dialog.css</name> + <name>scripts/tiny_mce/themes/advanced/skins/default/dialog.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/dialog.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/buttons.png</name> + <name>scripts/tiny_mce/themes/advanced/skins/default/img/buttons.png</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/buttons.png</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/items.gif</name> + <name>scripts/tiny_mce/themes/advanced/skins/default/img/items.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/items.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif</name> + <name>scripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif</name> + <name>scripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/progress.gif</name> + <name>scripts/tiny_mce/themes/advanced/skins/default/img/progress.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/progress.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif</name> + <name>scripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/ui.css</name> + <name>scripts/tiny_mce/themes/advanced/skins/default/ui.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/ui.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/content.css</name> + <name>scripts/tiny_mce/themes/advanced/skins/o2k7/content.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/content.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css</name> + <name>scripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png</name> + <name>scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png</name> + <name>scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png</name> + <name>scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/ui.css</name> + <name>scripts/tiny_mce/themes/advanced/skins/o2k7/ui.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/ui.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css</name> + <name>scripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css</name> + <name>scripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/source_editor.htm</name> + <name>scripts/tiny_mce/themes/advanced/source_editor.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/source_editor.htm</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/editor_template.js</name> + <name>scripts/tiny_mce/themes/simple/editor_template.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/editor_template.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/editor_template_src.js</name> + <name>scripts/tiny_mce/themes/simple/editor_template_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/editor_template_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/img/icons.gif</name> + <name>scripts/tiny_mce/themes/simple/img/icons.gif</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/img/icons.gif</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/langs/en.js</name> + <name>scripts/tiny_mce/themes/simple/langs/en.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/langs/en.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/default/content.css</name> + <name>scripts/tiny_mce/themes/simple/skins/default/content.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/default/content.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/default/ui.css</name> + <name>scripts/tiny_mce/themes/simple/skins/default/ui.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/default/ui.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/o2k7/content.css</name> + <name>scripts/tiny_mce/themes/simple/skins/o2k7/content.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/o2k7/content.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png</name> + <name>scripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/o2k7/ui.css</name> + <name>scripts/tiny_mce/themes/simple/skins/o2k7/ui.css</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/o2k7/ui.css</path> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce.js</name> + <name>scripts/tiny_mce/tiny_mce.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_popup.js</name> + <name>scripts/tiny_mce/tiny_mce_popup.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_popup.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js</name> + <name>scripts/tiny_mce/tiny_mce_src.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/utils/editable_selects.js</name> + <name>scripts/tiny_mce/utils/editable_selects.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/utils/editable_selects.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/utils/form_utils.js</name> + <name>scripts/tiny_mce/utils/form_utils.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/utils/form_utils.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/utils/mctabs.js</name> + <name>scripts/tiny_mce/utils/mctabs.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/utils/mctabs.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource> - <name>org/richfaces/renderkit/html/scripts/tiny_mce/utils/validate.js</name> + <name>scripts/tiny_mce/utils/validate.js</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/utils/validate.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> - </resource-config> +</resource-config> Deleted: trunk/sandbox/ui/editor/src/main/java/org/richfaces/component/TinyMceLoaderServlet.java =================================================================== --- trunk/sandbox/ui/editor/src/main/java/org/richfaces/component/TinyMceLoaderServlet.java 2008-10-15 09:35:26 UTC (rev 10757) +++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/component/TinyMceLoaderServlet.java 2008-10-15 09:35:34 UTC (rev 10758) @@ -1,98 +0,0 @@ -package org.richfaces.component; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Servlet for loading TinyMCE resources - * - * @web.servlet name="TinyMCELoaderServlet" display-name="TinyMCE Loader - * Servlet" - * - * @web.servlet-mapping url-pattern="/a4j/g/3_3_0-SNAPSHOTorg/richfaces/renderkit/html/scripts/tiny_mce/*" - * - * @author Alexandr Levkovsky - * - */ -public class TinyMceLoaderServlet extends javax.servlet.http.HttpServlet { - - private static final long serialVersionUID = 1L; - protected final Log logger = LogFactory.getLog(getClass()); - - private static final String TINYMCE_RESOURCES_LOCATION = "org/richfaces/renderkit/html/scripts/tiny_mce"; - - protected void doGet(HttpServletRequest request, - HttpServletResponse response) throws ServletException { - String requestedResource = request.getPathInfo(); - if (requestedResource.indexOf(".jsf") > 0) { - requestedResource = requestedResource.split(".jsf")[0]; - } - String path = TINYMCE_RESOURCES_LOCATION + requestedResource; - try { - - if(requestedResource.indexOf(".js") > 0){ - response.setContentType("text/javascript"); - } - copyFileToOutput(path, response.getOutputStream()); - - } catch (Exception e) { - e.printStackTrace(); - } - - } - - /** - * Open input stream using path to file - * - * @param path - * @return - */ - private InputStream getFileStream(String path) { - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - InputStream is = cl.getResourceAsStream(path); - - return is; - } - - /** - * Copies file to output stream - * - * @param path - * @param os - */ - private void copyFileToOutput(String path, OutputStream os) { - InputStream is = getFileStream(path); - - try { - if (is != null) { - - int size = is.available(); - byte[] buf = new byte[size]; - int i = 0; - while ((i = is.read(buf)) != -1) { - os.write(buf, 0, i); - } - } else { - logger.warn("Cannot load TinyMCE resource: " + path); - } - } catch (IOException ioex) { - logger.warn("Cannot load TinyMCE resource: " + path); - } finally { - if (is != null) { - try { - is.close(); - } catch (IOException ioex) { - // just ignore it here - } - } - } - } -} Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js =================================================================== --- trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-10-15 09:35:26 UTC (rev 10757) +++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-10-15 09:35:34 UTC (rev 10758) @@ -6,7 +6,7 @@ };*/ //Richfaces.Editor.ResourceHTML = "ghdfgsdfgsdfgsdfgdf sg sdfg$1fgsdfdfgdfg"; - +/* RichEditor = Class.create(); Object.extend(RichEditor.prototype, { initialize: function(id,parameters) { @@ -16,5 +16,5 @@ { } -}); +});*/ \ No newline at end of file Modified: trunk/sandbox/ui/editor/src/main/templates/editor.jspx =================================================================== --- trunk/sandbox/ui/editor/src/main/templates/editor.jspx 2008-10-15 09:35:26 UTC (rev 10757) +++ trunk/sandbox/ui/editor/src/main/templates/editor.jspx 2008-10-15 09:35:34 UTC (rev 10758) @@ -12,7 +12,7 @@ <f:clientid var="clientId"/> <h:styles>css/editor.xcss</h:styles> - <h:scripts>org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js, scripts/editor.js</h:scripts> + <h:scripts>scripts/editor.js, scripts/tiny_mce/tiny_mce_src.js</h:scripts> <div id="#{clientId}" x:passThruWithExclusions="id,value" class="rich-editor"> @@ -31,6 +31,8 @@ </textarea> <script type="text/javascript"> + + tinyMCE.init({ mode: '#{component.attributes['mode']}', theme: '#{component.attributes['theme']}'

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r10757 - trunk/sandbox/samples/editor-sample/src/main/webapp/WEB-INF.

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

Author: alevkovsky Date: 2008-10-15 05:35:26 -0400 (Wed, 15 Oct 2008) New Revision: 10757 Modified: trunk/sandbox/samples/editor-sample/src/main/webapp/WEB-INF/web.xml Log: Adjust resources-config and editor template for tiny scripts loading Modified: trunk/sandbox/samples/editor-sample/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/sandbox/samples/editor-sample/src/main/webapp/WEB-INF/web.xml 2008-10-15 09:35:23 UTC (rev 10756) +++ trunk/sandbox/samples/editor-sample/src/main/webapp/WEB-INF/web.xml 2008-10-15 09:35:26 UTC (rev 10757) @@ -48,7 +48,7 @@ <servlet-mapping> <servlet-name>TinyMCELoaderServlet</servlet-name> <url-pattern>/a4j/g/3_3_0-SNAPSHOTorg/richfaces/renderkit/html/scripts/tiny_mce/*</url-pattern> - </servlet-mapping--!> + </servlet-mapping--> <login-config> <auth-method>BASIC</auth-method> </login-config>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r10756 - trunk/sandbox/samples/editorSeam-sample/src/main/webapp/WEB-INF.

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

Author: alevkovsky Date: 2008-10-15 05:35:23 -0400 (Wed, 15 Oct 2008) New Revision: 10756 Modified: trunk/sandbox/samples/editorSeam-sample/src/main/webapp/WEB-INF/web.xml Log: Adjust resources-config and editor template for tiny scripts loading Modified: trunk/sandbox/samples/editorSeam-sample/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/sandbox/samples/editorSeam-sample/src/main/webapp/WEB-INF/web.xml 2008-10-15 08:50:44 UTC (rev 10755) +++ trunk/sandbox/samples/editorSeam-sample/src/main/webapp/WEB-INF/web.xml 2008-10-15 09:35:23 UTC (rev 10756) @@ -14,18 +14,17 @@ <listener> <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> </listener> -<filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> + <filter> <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>Seam Filter</filter-name> <servlet-name>Faces Servlet</servlet-name> <dispatcher>FORWARD</dispatcher> <dispatcher>REQUEST</dispatcher> <dispatcher>INCLUDE</dispatcher> - </filter-mapping> + </filter-mapping> <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> @@ -35,7 +34,7 @@ <servlet-name>Faces Servlet</servlet-name> <url-pattern>*.jsf</url-pattern> </servlet-mapping> - <servlet> +  <login-config> <auth-method>BASIC</auth-method> </login-config>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r10755 - trunk/ui/columns/src/main/java/org/richfaces/taglib.

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

Author: andrei_exadel Date: 2008-10-15 04:50:44 -0400 (Wed, 15 Oct 2008) New Revision: 10755 Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java Log: RF-4609 Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java =================================================================== --- trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2008-10-15 07:27:15 UTC (rev 10754) +++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2008-10-15 08:50:44 UTC (rev 10755) @@ -90,6 +90,8 @@ /** Column incrementer */ private Integer counter = 0; + private String jspId; + /** * style CSS style(s) is/are to be applied when this component is rendered @@ -532,7 +534,7 @@ } private void initItarationId() { - String jspId = getJspId(); + jspId = (jspId == null) ? getJspId() : jspId; if (jspId != null) { setJspId(jspId); // We need it twice! setJspId(jspId);

16 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits October 2008