May 2009 - richfaces-svn-commits - Jboss List Archives

JBoss Rich Faces SVN: r14255 - in branches/community/3.3.X/examples/photoalbum/tests: src/test/java/org/richfaces/photoalbum and 1 other directory.

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

Author: konstantin.mishin Date: 2009-05-20 14:00:28 -0400 (Wed, 20 May 2009) New Revision: 14255 Modified: branches/community/3.3.X/examples/photoalbum/tests/pom.xml branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java Log: RF-7083 Modified: branches/community/3.3.X/examples/photoalbum/tests/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/tests/pom.xml 2009-05-20 17:05:26 UTC (rev 14254) +++ branches/community/3.3.X/examples/photoalbum/tests/pom.xml 2009-05-20 18:00:28 UTC (rev 14255) @@ -14,7 +14,7 @@ <properties> <jboss.version>4.2.3.GA</jboss.version> <jbosshome>${project.basedir}/target/installs/jboss-${jboss.version}/jboss-${jboss.version}</jbosshome> - <jboss.installer.url>file:F:\Distribs\jboss-${jboss.version}.zip</jboss.installer.url> + <jboss.installer.url>file:d:\workspace\jboss-${jboss.version}.zip</jboss.installer.url> <jbosscontext>default</jbosscontext> </properties> @@ -68,22 +68,28 @@ <classifier>jdk15</classifier> </dependency> <dependency> - <groupId>org.openqa.selenium.client-drivers</groupId> + <groupId>org.seleniumhq.selenium.core</groupId> + <artifactId>selenium-core</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> <artifactId>selenium-java-client-driver</artifactId> <version>1.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.openqa.selenium.server</groupId> + <groupId>org.seleniumhq.selenium.server</groupId> <artifactId>selenium-server-coreless</artifactId> <version>1.0-SNAPSHOT</version> <scope>test</scope> - <exclusions> +  </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> Modified: branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java 2009-05-20 17:05:26 UTC (rev 14254) +++ branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java 2009-05-20 18:00:28 UTC (rev 14255) @@ -77,7 +77,7 @@ @BeforeSuite public void startSeleniumServer() throws Exception { RemoteControlConfiguration config = new RemoteControlConfiguration(); - config.setMultiWindow(false); + config.setSingleWindow(true); config.setPort(seleniumServerPort); config.setUserExtensions(new File(getClass().getClassLoader().getResource("script/selenium/user-extensions.js").toURI())); seleniumServer = new SeleniumServer(false, config);

15 years

1
0
0 / 0

JBoss Rich Faces SVN: r14254 - branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts.

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

Author: nbelaevski Date: 2009-05-20 13:05:26 -0400 (Wed, 20 May 2009) New Revision: 14254 Modified: branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js Log: https://jira.jboss.org/jira/browse/RF-7179 Modified: branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js =================================================================== --- branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2009-05-20 16:08:32 UTC (rev 14253) +++ branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2009-05-20 17:05:26 UTC (rev 14254) @@ -333,19 +333,9 @@ newLastPanel.enableInnerSelects(); } } else { - var children = document.body.childNodes; - for (var k = 0; k < children.length; k++) { - var child = children[k]; - - if (!child.getElementsByTagName) { - continue; - } - - var selects = child.getElementsByTagName("SELECT"); - - for (var i = 0; i < selects.length; i++) { - this.enableSelect(selects[i]); - } + var selects = document.body.getElementsByTagName("SELECT"); + for (var i = 0; i < selects.length; i++) { + this.enableSelect(selects[i]); } } }, @@ -363,24 +353,28 @@ this.enableInnerSelects(); } else { //disable all outer - var children = document.body.childNodes; - for (var k = 0; k < children.length; k++) { - var child = children[k]; - - if (child == this.id) { - continue; + var selects = document.body.getElementsByTagName("SELECT"); + + var innerSelects = this.id.getElementsByTagName("SELECT"); + var firstInnerSelect = innerSelects[0]; + var lastInnerSelect = innerSelects[innerSelects.length - 1]; + + var selectsAreInner = false; + + for (var i = 0; i < selects.length; i++) { + var select = selects[i]; + if (select == firstInnerSelect) { + selectsAreInner = true; } - if (!child.getElementsByTagName) { - continue; + if (!selectsAreInner) { + this.disableSelect(select); } - var selects = child.getElementsByTagName("SELECT"); - - for (var i = 0; i < selects.length; i++) { - this.disableSelect(selects[i]); + if (select == lastInnerSelect) { + selectsAreInner = false; } - } + } } },

15 years

1
0
0 / 0

JBoss Rich Faces SVN: r14253 - branches/community/3.3.X/test-applications/seleniumTest.

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

Author: konstantin.mishin Date: 2009-05-20 12:08:32 -0400 (Wed, 20 May 2009) New Revision: 14253 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml Log: RF-7083 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05-20 16:02:04 UTC (rev 14252) +++ branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05-20 16:08:32 UTC (rev 14253) @@ -219,12 +219,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.seleniumhq.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.seleniumhq.selenium.server</groupId> <artifactId>selenium-server-coreless</artifactId> <version>1.0-SNAPSHOT</version>

15 years

1
0
0 / 0

JBoss Rich Faces SVN: r14252 - branches/community/3.3.X/test-applications/seleniumTest.

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

Author: konstantin.mishin Date: 2009-05-20 12:02:04 -0400 (Wed, 20 May 2009) New Revision: 14252 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml Log: RF-7083 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05-20 15:22:18 UTC (rev 14251) +++ branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05-20 16:02:04 UTC (rev 14252) @@ -19,7 +19,7 @@ </properties> <repositories> <repository> - <id>openqa</id> + <id>nexus-openqa</id> <name>OpenQA Repository</name> <url>http://nexus.openqa.org/content/repositories/releases</url> <layout>default</layout> @@ -31,7 +31,7 @@ </releases> </repository> <repository> - <id>openqa-snapshots</id> + <id>nexus-openqa-snapshots</id> <name>OpenQA Snapshots Repository</name> <url>http://nexus.openqa.org/content/repositories/snapshots</url> <layout>default</layout>

15 years

1
0
0 / 0

JBoss Rich Faces SVN: r14251 - branches/community/3.3.X/samples/richfaces-demo.

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

Author: nbelaevski Date: 2009-05-20 11:22:18 -0400 (Wed, 20 May 2009) New Revision: 14251 Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml Log: richfaces-demo: TLD docs build moved into "release" profile Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-05-20 14:53:29 UTC (rev 14250) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-05-20 15:22:18 UTC (rev 14251) @@ -26,73 +26,12 @@ http://repository.jboss.com/maven2/ </url> </repository> - </repositories> + </repositories> <build> <finalName>richfaces-demo</finalName> <plugins> <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>${project.version}</version> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/richfaces</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>tlddoc</id> - <phase>process-resources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>taglibrarydoc</groupId> - <artifactId>tlddoc</artifactId> - <version>1.3</version> - </dependency> - </dependencies> - <configuration> - <includeProjectDependencies>false</includeProjectDependencies> - <includePluginDependencies>true</includePluginDependencies> - <executableDependency> - <groupId>taglibrarydoc</groupId> - <artifactId>tlddoc</artifactId> - </executableDependency> - <mainClass>com.sun.tlddoc.TLDDoc</mainClass> - <arguments> - <argument>-d</argument> - <argument>${project.build.directory}/${project.build.finalName}/WEB-INF/tlddoc</argument> - <argument>-xslt</argument> - <argument>${basedir}/src/main/xslt/tlddoc</argument> - <argument>${project.build.directory}/richfaces/META-INF/ajax4jsf.tld</argument> - <argument>${project.build.directory}/richfaces/META-INF/rich.tld</argument> - </arguments> - </configuration> - </plugin> - <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> <source>1.5</source> @@ -117,6 +56,67 @@ <id>release</id> <build> <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>${project.version}</version> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/richfaces</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>tlddoc</id> + <phase>process-resources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>taglibrarydoc</groupId> + <artifactId>tlddoc</artifactId> + <version>1.3</version> + </dependency> + </dependencies> + <configuration> + <includeProjectDependencies>false</includeProjectDependencies> + <includePluginDependencies>true</includePluginDependencies> + <executableDependency> + <groupId>taglibrarydoc</groupId> + <artifactId>tlddoc</artifactId> + </executableDependency> + <mainClass>com.sun.tlddoc.TLDDoc</mainClass> + <arguments> + <argument>-d</argument> + <argument>${project.build.directory}/${project.build.finalName}/WEB-INF/tlddoc</argument> + <argument>-xslt</argument> + <argument>${basedir}/src/main/xslt/tlddoc</argument> + <argument>${project.build.directory}/richfaces/META-INF/ajax4jsf.tld</argument> + <argument>${project.build.directory}/richfaces/META-INF/rich.tld</argument> + </arguments> + </configuration> + </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> <executions> @@ -400,5 +400,5 @@ </exclusion> </exclusions> </dependency> - </dependencies> + </dependencies> </project>

15 years

1
0
0 / 0

JBoss Rich Faces SVN: r14250 - in branches/community/3.3.X/examples/photoalbum/source: ejb and 2 other directories.

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

Author: Alex.Kolonitsky Date: 2009-05-20 10:53:29 -0400 (Wed, 20 May 2009) New Revision: 14250 Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml branches/community/3.3.X/examples/photoalbum/source/pom.xml branches/community/3.3.X/examples/photoalbum/source/web/pom.xml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/components.xml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/web.xml Log: add profile full into pom.xml https://jira.jboss.org/jira/browse/RF-7201 Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2009-05-20 13:33:32 UTC (rev 14249) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2009-05-20 14:53:29 UTC (rev 14250) @@ -107,16 +107,16 @@  <phase>validate</phase> <goals> - <goal>copy-resources</goal> + <goal>copy-resources</goal> </goals> <configuration> <outputDirectory>${project.build.directory}/resources-filtered</outputDirectory> <resources> - <resource> - <directory>src/main/resources-filtered</directory> - <filtering>true</filtering> - </resource> - </resources> + <resource> + <directory>src/main/resources-filtered</directory> + <filtering>true</filtering> + </resource> + </resources> </configuration> </execution> </executions> Modified: branches/community/3.3.X/examples/photoalbum/source/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/pom.xml 2009-05-20 13:33:32 UTC (rev 14249) +++ branches/community/3.3.X/examples/photoalbum/source/pom.xml 2009-05-20 14:53:29 UTC (rev 14250) @@ -37,6 +37,8 @@ <imageset>short</imageset> <imagespath>short</imagespath> <environment.properties>environment/dev</environment.properties> + <environment.debug>true</environment.debug> + <environment.facelets.REFRESH_PERIOD>2</environment.facelets.REFRESH_PERIOD> </properties> <repositories> <repository> @@ -105,11 +107,31 @@ <profiles> <profile> + <id>short</id> + <properties> + <imageset>short</imageset> + <imagespath>short</imagespath> + <environment.properties>environment/dev</environment.properties> + </properties> + </profile> + + <profile> + <id>full</id> + <properties> + <imageset>full</imageset> + <imagespath>full</imagespath> + <environment.properties>environment/dev</environment.properties> + </properties> + </profile> + + <profile> <id>livedemo</id> <properties> <imageset>full</imageset> <imagespath>full</imagespath> <environment.properties>environment/prod</environment.properties> + <environment.debug>false</environment.debug> + <environment.facelets.REFRESH_PERIOD>-1</environment.facelets.REFRESH_PERIOD> </properties> </profile> </profiles> Modified: branches/community/3.3.X/examples/photoalbum/source/web/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2009-05-20 13:33:32 UTC (rev 14249) +++ branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2009-05-20 14:53:29 UTC (rev 14250) @@ -314,10 +314,29 @@ </execution> </executions> </plugin> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <webResource> + <directory>${basedir}/src/main/webapp/WEB-INF + </directory> + <includes> + <include>components.xml</include> + <include>web.xml</include> + </includes> + <targetPath>WEB-INF</targetPath> + <filtering>true</filtering> + </webResource> + </webResources> + </configuration> </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + </plugin> </plugins> </build> </project> Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/components.xml 2009-05-20 13:33:32 UTC (rev 14249) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/components.xml 2009-05-20 14:53:29 UTC (rev 14250) @@ -20,7 +20,7 @@ http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.0.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.0.xsd"> - <core:init transaction-management-enabled="false" debug="true" jndi-pattern="@jndiPattern@"/> + <core:init transaction-management-enabled="false" debug="${environment.debug}" jndi-pattern="@jndiPattern@"/> <core:manager concurrent-request-timeout="20000" conversation-timeout="200000" conversation-id-parameter="cid" Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/web.xml 2009-05-20 13:33:32 UTC (rev 14249) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/web.xml 2009-05-20 14:53:29 UTC (rev 14250) @@ -70,10 +70,10 @@ <param-value>/WEB-INF/tags/photoalbum-taglib.xml</param-value> </context-param> -  + <param-value>${environment.facelets.REFRESH_PERIOD}</param-value> + </context-param> <context-param> <param-name>org.richfaces.LoadScriptStrategy</param-name>

15 years

1
0
0 / 0

JBoss Rich Faces SVN: r14249 - in branches/community/3.3.X/test-applications/seleniumTest: richfaces/src/main/webapp/layout and 1 other directories.

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

Author: konstantin.mishin Date: 2009-05-20 09:33:32 -0400 (Wed, 20 May 2009) New Revision: 14249 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/layout/layout.xhtml branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java Log: RF-7083 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05-20 12:46:22 UTC (rev 14248) +++ branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05-20 13:33:32 UTC (rev 14249) @@ -21,7 +21,7 @@ <repository> <id>openqa</id> <name>OpenQA Repository</name> - <url>http://archiva.openqa.org/repository/releases</url> + <url>http://nexus.openqa.org/content/repositories/releases</url> <layout>default</layout> <snapshots> <enabled>false</enabled> @@ -33,7 +33,7 @@ <repository> <id>openqa-snapshots</id> <name>OpenQA Snapshots Repository</name> - <url>http://archiva.openqa.org/repository/snapshots</url> + <url>http://nexus.openqa.org/content/repositories/snapshots</url> <layout>default</layout> <snapshots> <enabled>true</enabled> @@ -207,22 +207,34 @@ <classifier>jdk15</classifier> </dependency> <dependency> - <groupId>org.openqa.selenium.client-drivers</groupId> + <groupId>org.seleniumhq.selenium.core</groupId> + <artifactId>selenium-core</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> <artifactId>selenium-java-client-driver</artifactId> <version>1.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.openqa.selenium.server</groupId> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.server</groupId> <artifactId>selenium-server-coreless</artifactId> <version>1.0-SNAPSHOT</version> <scope>test</scope> - <exclusions> +  </dependency> <dependency> <groupId>org.richfaces.ui</groupId> Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/layout/layout.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-05-20 12:46:22 UTC (rev 14248) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-05-20 13:33:32 UTC (rev 14249) @@ -127,7 +127,7 @@ config.setFirefoxProfileTemplate(new File(getFirefoxTemplate())); } config.setUserExtensions(new File(getClass().getClassLoader().getResource("script/selenium/user-extensions.js").toURI())); - config.setMultiWindow(false); + config.setSingleWindow(true); //TODO only for test config.setPort(16334); seleniumServer = new SeleniumServer(false, config);

15 years

1
0
0 / 0

JBoss Rich Faces SVN: r14248 - branches/community/3.3.X/ui/editor/src/main/templates.

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

Author: nbelaevski Date: 2009-05-20 08:46:22 -0400 (Wed, 20 May 2009) New Revision: 14248 Modified: branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx Log: https://jira.jboss.org/jira/browse/RF-7150 Modified: branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx =================================================================== --- branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx 2009-05-20 11:31:13 UTC (rev 14247) +++ branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx 2009-05-20 12:46:22 UTC (rev 14248) @@ -13,13 +13,14 @@ <f:clientid var="clientId"/> <h:styles>css/editor.xcss</h:styles> <h:scripts>new org.ajax4jsf.javascript.AjaxScript(), new org.ajax4jsf.javascript.PrototypeScript(), scripts/tiny_mce/tiny_mce_src.js, scripts/editor.js</h:scripts> + + <div id="#{clientId}" x:passThruWithExclusions="id,value,styleClass,class" + class="rich-editor #{component.attributes['styleClass']}"> <jsp:scriptlet> <![CDATA[ if(shouldRenderTinyMCE(component)) { ]]> </jsp:scriptlet> - <div id="#{clientId}" x:passThruWithExclusions="id,value,styleClass,class" - class="rich-editor #{component.attributes['styleClass']}"> <textarea id="#{clientId}TextArea" name="#{clientId}TextArea" style="visibility: hidden"> @@ -36,23 +37,22 @@ new RichEditor('#{clientId}', richParams, tinyMceParams); </script> - </div> + <jsp:scriptlet> <![CDATA[ } else { ]]> </jsp:scriptlet> - <div id="#{clientId}" x:passThruWithExclusions="id,value,styleClass,class" - class="rich-editor #{component.attributes['styleClass']}" style="#{component.attributes['style']}"> + <textarea id="#{clientId}TextArea" name="#{clientId}TextArea" style="#{this:getTextAreaStyle(component)}" tabindex="#{component.attributes['tabindex']}"> #{this:getFormattedComponentStringValue(context, component)} </textarea> - </div> <jsp:scriptlet> <![CDATA[ } ]]> </jsp:scriptlet> + </div> </f:root>

15 years

1
0
0 / 0

JBoss Rich Faces SVN: r14247 - in branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes: shelf and 1 other directory.

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

Author: Alex.Kolonitsky Date: 2009-05-20 07:31:13 -0400 (Wed, 20 May 2009) New Revision: 14247 Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelfInfo.xhtml Log: Link "View shelf" on shelf view page doesn't need https://jira.jboss.org/jira/browse/RF-7196 Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelfInfo.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf.xhtml =================================================================== (Binary files differ)

15 years

1
0
0 / 0

JBoss Rich Faces SVN: r14246 - in branches/jsf2.0/cdk: generator and 3 other directories.

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

Author: alexsmirnov Date: 2009-05-19 20:47:25 -0400 (Tue, 19 May 2009) New Revision: 14246 Added: branches/jsf2.0/cdk/generator/src/main/xjb/ branches/jsf2.0/cdk/generator/src/main/xsd/ branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd Removed: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/ant/ Modified: branches/jsf2.0/cdk/generator/pom.xml branches/jsf2.0/cdk/pom.xml Log: start converting cdk to jaxb-based parser. Modified: branches/jsf2.0/cdk/generator/pom.xml =================================================================== --- branches/jsf2.0/cdk/generator/pom.xml 2009-05-19 22:58:34 UTC (rev 14245) +++ branches/jsf2.0/cdk/generator/pom.xml 2009-05-20 00:47:25 UTC (rev 14246) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> @@ -26,32 +28,27 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> + <version>4.6</version> <scope>test</scope> </dependency> <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> + <groupId>freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.9</version> </dependency> <dependency> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - <version>1.4</version> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.1</version> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.6</version> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.1.10</version> </dependency> <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.5</version> - </dependency> - <dependency> <groupId>com.sun.faces</groupId> - <artifactId>mojarra-jsf-api</artifactId> + <artifactId>jsf-api</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> @@ -62,32 +59,17 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.0</version> + <version>1.2</version> </dependency> <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + <version>2.0.1.GA</version> </dependency> <dependency> - <groupId>qdox</groupId> - <artifactId>qdox</artifactId> - <version>1.6</version> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.1_3</version> - </dependency> - <dependency> - <groupId>wutka</groupId> - <artifactId>dtdparser</artifactId> - <version>1.21</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> - </dependencies> + </dependencies> </project> \ No newline at end of file Added: branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd =================================================================== --- branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd (rev 0) +++ branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd 2009-05-20 00:47:25 UTC (rev 14246) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema targetNamespace="http://richfaces.org/cdk" + elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:cdk="http://richfaces.org/cdk" attributeFormDefault="unqualified"> + <xsd:annotation> + <xsd:documentation>$Id$</xsd:documentation> + </xsd:annotation> + + <xsd:element name="components" type="xsd:string"></xsd:element> + + <xsd:complexType name="componentsType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="component" type="cdk:componentType"></xsd:element> + <xsd:element name="renderer" type="xsd:string"></xsd:element> + <xsd:element name="listener" type="xsd:string"></xsd:element> + <xsd:element name="behavior" type="xsd:string"></xsd:element> + <xsd:element name="validator" type="xsd:string"></xsd:element> + <xsd:element name="converter" type="xsd:string"></xsd:element> + <xsd:element name="function" type="xsd:string"></xsd:element> + </xsd:choice> + <xsd:attribute name="id" type="xsd:ID"></xsd:attribute> + <xsd:attribute name="version" + type="cdk:components-versionType"> + </xsd:attribute> + </xsd:complexType> + + <xsd:simpleType name="components-versionType"> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="4.0"></xsd:enumeration> + </xsd:restriction> + </xsd:simpleType> + + <xsd:complexType name="cdk-object-type"> + <xsd:attribute name="id" type="xsd:ID"></xsd:attribute> + <xsd:attribute name="generate" type="xsd:boolean"></xsd:attribute> + </xsd:complexType> + + <xsd:complexType name="componentType"> + <xsd:complexContent> + <xsd:extension base="cdk:cdk-object-type"></xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:simpleType name="javaType"> + <xsd:restriction base="xsd:token"></xsd:restriction> + </xsd:simpleType> + + <xsd:complexType name="classnameType"> + <xsd:simpleContent> + <xsd:restriction base="cdk:javaType"></xsd:restriction> + </xsd:simpleContent> + </xsd:complexType> +</xsd:schema> \ No newline at end of file Property changes on: branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jsf2.0/cdk/pom.xml =================================================================== --- branches/jsf2.0/cdk/pom.xml 2009-05-19 22:58:34 UTC (rev 14245) +++ branches/jsf2.0/cdk/pom.xml 2009-05-20 00:47:25 UTC (rev 14246) @@ -10,22 +10,6 @@ <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> - <dependencies /> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> <modules> <module>generator</module> <module>maven-cdk-plugin</module> @@ -33,35 +17,6 @@ <module>maven-archetype-jsf-component</module> <module>maven-archetype-jsfwebapp</module> <module>maven-archetype-plug-n-skin</module> - </modules> - - <profiles> - <profile> - <id>clover</id> - <build> - <plugins> - <plugin> - <groupId>com.atlassian.maven.plugins</groupId> - <artifactId>maven-clover2-plugin</artifactId> - <configuration> - <includesAllSourceRoots> - false - </includesAllSourceRoots> - <includesTestSourceRoots> - false - </includesTestSourceRoots> - <jdk>1.5</jdk> - - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> \ No newline at end of file

15 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits May 2009