JBoss Rich Faces SVN: r10519 - in trunk/framework/impl/src: test/java/org/ajax4jsf/css and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-09-20 12:06:31 -0400 (Sat, 20 Sep 2008)
New Revision: 10519
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/css/CssCompressor.java
trunk/framework/impl/src/test/java/org/ajax4jsf/css/CssCompressorTest.java
Log:
https://jira.jboss.org/jira/browse/RF-4498
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/css/CssCompressor.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/css/CssCompressor.java 2008-09-20 00:03:56 UTC (rev 10518)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/css/CssCompressor.java 2008-09-20 16:06:31 UTC (rev 10519)
@@ -15,142 +15,180 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.ajax4jsf.resource.CountingOutputWriter;
-
public class CssCompressor {
- private StringBuffer srcsb = null;
+ private StringBuffer srcsb = null;
- public CssCompressor(StringBuffer buffer) throws IOException {
- srcsb = buffer;
- }
+ public CssCompressor(StringBuffer buffer) throws IOException {
+ srcsb = buffer;
+ }
- public int compress(Writer out, int linebreakpos)
- throws IOException {
-
- Pattern p;
- Matcher m;
- String css;
- StringBuffer sb;
- int startIndex, endIndex;
- int bytesLength;
+ public int compress(Writer out, int linebreakpos) throws IOException {
- // Remove all comment blocks...
- sb = new StringBuffer(srcsb.toString());
- while ((startIndex = sb.indexOf("/*")) >= 0) {
- endIndex = sb.indexOf("*/", startIndex + 2);
- if (endIndex >= startIndex + 2)
- sb.delete(startIndex, endIndex + 2);
- }
+ Pattern p;
+ Matcher m;
+ String css;
+ StringBuffer sb;
+ int startIndex, endIndex;
- css = sb.toString();
+ // Remove all comment blocks...
+ startIndex = 0;
+ boolean iemac = false;
+ boolean preserve = false;
+ sb = new StringBuffer(srcsb.toString());
+ while ((startIndex = sb.indexOf("/*", startIndex)) >= 0) {
+ preserve = sb.length() > startIndex + 2
+ && sb.charAt(startIndex + 2) == '!';
+ endIndex = sb.indexOf("*/", startIndex + 2);
+ if (endIndex < 0) {
+ if (!preserve) {
+ sb.delete(startIndex, sb.length());
+ }
+ } else if (endIndex >= startIndex + 2) {
+ if (sb.charAt(endIndex - 1) == '\\') {
+ // Looks like a comment to hide rules from IE Mac.
+ // Leave this comment, and the following one, alone...
+ startIndex = endIndex + 2;
+ iemac = true;
+ } else if (iemac) {
+ startIndex = endIndex + 2;
+ iemac = false;
+ } else if (!preserve) {
+ sb.delete(startIndex, endIndex + 2);
+ } else {
+ startIndex = endIndex + 2;
+ }
+ }
+ }
- // Normalize all whitespace strings to single spaces. Easier to work with that way.
- css = css.replaceAll("\\s+", " ");
+ css = sb.toString();
- // Remove the spaces before the things that should not have spaces before them.
- // But, be careful not to turn "p :link {...}" into "p:link{...}"
- // Swap out any pseudo-class colons with the token, and then swap back.
- sb = new StringBuffer();
- p = Pattern.compile("(^|\\})(([^\\{:])+:)+([^\\{]*\\{)");
- m = p.matcher(css);
- while (m.find()) {
- String s = m.group();
- s = s.replaceAll(":", "___PSEUDOCLASSCOLON___");
- m.appendReplacement(sb, s);
- }
- m.appendTail(sb);
- css = sb.toString();
- css = css.replaceAll("\\s+([!{};:>+\\(\\)\\],])", "$1");
- css = css.replaceAll("___PSEUDOCLASSCOLON___", ":");
+ // Normalize all whitespace strings to single spaces. Easier to work
+ // with that way.
+ css = css.replaceAll("\\s+", " ");
- // Remove the spaces after the things that should not have spaces after them.
- css = css.replaceAll("([!{}:;>+\\(\\[,])\\s+", "$1");
+ // Make a pseudo class for the Box Model Hack
+ css = css.replaceAll("\"\\\\\"}\\\\\"\"", "___PSEUDOCLASSBMH___");
- // Add the semicolon where it's missing.
- css = css.replaceAll("([^;\\}])}", "$1;}");
+ // Remove the spaces before the things that should not have spaces
+ // before them.
+ // But, be careful not to turn "p :link {...}" into "p:link{...}"
+ // Swap out any pseudo-class colons with the token, and then swap back.
+ sb = new StringBuffer();
+ p = Pattern.compile("(^|\\})(([^\\{:])+:)+([^\\{]*\\{)");
+ m = p.matcher(css);
+ while (m.find()) {
+ String s = m.group();
+ s = s.replaceAll(":", "___PSEUDOCLASSCOLON___");
+ m.appendReplacement(sb, s);
+ }
+ m.appendTail(sb);
+ css = sb.toString();
+ css = css.replaceAll("\\s+([!{};:>+\\(\\)\\],])", "$1");
+ css = css.replaceAll("___PSEUDOCLASSCOLON___", ":");
- // Replace 0(px,em,%) with 0.
- css = css.replaceAll("([\\s:])(0)(px|em|%|in|cm|mm|pc|pt|ex)", "$1$2");
+ // Remove the spaces after the things that should not have spaces after
+ // them.
+ css = css.replaceAll("([!{}:;>+\\(\\[,])\\s+", "$1");
- // Replace 0 0 0 0; with 0.
- css = css.replaceAll(":0 0 0 0;", ":0;");
- css = css.replaceAll(":0 0 0;", ":0;");
- css = css.replaceAll(":0 0;", ":0;");
- // Replace background-position:0; with background-position:0 0;
- css = css.replaceAll("background-position:0;", "background-position:0 0;");
+ // Add the semicolon where it's missing.
+ css = css.replaceAll("([^;\\}])}", "$1;}");
- // Replace 0.6 to .6, but only when preceded by : or a white-space
- css = css.replaceAll("(:|\\s)0+\\.(\\d+)", "$1.$2");
+ // Replace 0(px,em,%) with 0.
+ css = css.replaceAll("([\\s:])(0)(px|em|%|in|cm|mm|pc|pt|ex)", "$1$2");
- // Shorten colors from rgb(51,102,153) to #336699
- // This makes it more likely that it'll get further compressed in the next step.
- p = Pattern.compile("rgb\\s*\\(\\s*([0-9,\\s]+)\\s*\\)");
- m = p.matcher(css);
- sb = new StringBuffer();
- while (m.find()) {
- String[] rgbcolors = m.group(1).split(",");
- StringBuffer hexcolor = new StringBuffer("#");
- for (int i = 0; i < rgbcolors.length; i++) {
- int val = Integer.parseInt(rgbcolors[i]);
- if (val < 16) {
- hexcolor.append("0");
- }
- hexcolor.append(Integer.toHexString(val));
- }
- m.appendReplacement(sb, hexcolor.toString());
- }
- m.appendTail(sb);
- css = sb.toString();
+ // Replace 0 0 0 0; with 0.
+ css = css.replaceAll(":0 0 0 0;", ":0;");
+ css = css.replaceAll(":0 0 0;", ":0;");
+ css = css.replaceAll(":0 0;", ":0;");
+ // Replace background-position:0; with background-position:0 0;
+ css = css.replaceAll("background-position:0;",
+ "background-position:0 0;");
- // Shorten colors from #AABBCC to #ABC. Note that we want to make sure
- // the color is not preceded by either ", " or =. Indeed, the property
- // filter: chroma(color="#FFFFFF");
- // would become
- // filter: chroma(color="#FFF");
- // which makes the filter break in IE.
- p = Pattern.compile("([^\"'=\\s])(\\s*)#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])");
- m = p.matcher(css);
- sb = new StringBuffer();
- while (m.find()) {
- // Test for AABBCC pattern
- if (m.group(3).equalsIgnoreCase(m.group(4)) &&
- m.group(5).equalsIgnoreCase(m.group(6)) &&
- m.group(7).equalsIgnoreCase(m.group(8))) {
- m.appendReplacement(sb, m.group(1) + m.group(2) + "#" + m.group(3) + m.group(5) + m.group(7));
- } else {
- m.appendReplacement(sb, m.group());
- }
- }
- m.appendTail(sb);
- css = sb.toString();
+ // Replace 0.6 to .6, but only when preceded by : or a white-space
+ css = css.replaceAll("(:|\\s)0+\\.(\\d+)", "$1.$2");
- // Remove empty rules.
- css = css.replaceAll("[^\\}]+\\{;\\}", "");
+ // Shorten colors from rgb(51,102,153) to #336699
+ // This makes it more likely that it'll get further compressed in the
+ // next step.
+ p = Pattern.compile("rgb\\s*\\(\\s*([0-9,\\s]+)\\s*\\)");
+ m = p.matcher(css);
+ sb = new StringBuffer();
+ while (m.find()) {
+ String[] rgbcolors = m.group(1).split(",");
+ StringBuffer hexcolor = new StringBuffer("#");
+ for (int i = 0; i < rgbcolors.length; i++) {
+ int val = Integer.parseInt(rgbcolors[i]);
+ if (val < 16) {
+ hexcolor.append("0");
+ }
+ hexcolor.append(Integer.toHexString(val));
+ }
+ m.appendReplacement(sb, hexcolor.toString());
+ }
+ m.appendTail(sb);
+ css = sb.toString();
- if (linebreakpos >= 0) {
- // Some source control tools don't like it when files containing lines longer
- // than, say 8000 characters, are checked in. The linebreak option is used in
- // that case to split long lines after a specific column.
- int i = 0;
- int linestartpos = 0;
- sb = new StringBuffer(css);
- while (i < sb.length()) {
- char c = sb.charAt(i++);
- if (c == '}' && i - linestartpos > linebreakpos) {
- sb.insert(i, '\n');
- linestartpos = i;
- }
- }
+ // Shorten colors from #AABBCC to #ABC. Note that we want to make sure
+ // the color is not preceded by either ", " or =. Indeed, the property
+ // filter: chroma(color="#FFFFFF");
+ // would become
+ // filter: chroma(color="#FFF");
+ // which makes the filter break in IE.
+ p = Pattern
+ .compile("([^\"'=\\s])(\\s*)#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])");
+ m = p.matcher(css);
+ sb = new StringBuffer();
+ while (m.find()) {
+ // Test for AABBCC pattern
+ if (m.group(3).equalsIgnoreCase(m.group(4))
+ && m.group(5).equalsIgnoreCase(m.group(6))
+ && m.group(7).equalsIgnoreCase(m.group(8))) {
+ m.appendReplacement(sb, m.group(1) + m.group(2) + "#"
+ + m.group(3) + m.group(5) + m.group(7));
+ } else {
+ m.appendReplacement(sb, m.group());
+ }
+ }
+ m.appendTail(sb);
+ css = sb.toString();
- css = sb.toString();
- }
+ // Remove empty rules.
+ css = css.replaceAll("[^\\}]+\\{;\\}", "");
- // Trim the final string (for any leading or trailing white spaces)
- css = css.trim();
- bytesLength = css.length(); // * CountingOutputWriter.sizeOfChar;
- // Write the output...
- out.write(css);
- return bytesLength;
- }
+ if (linebreakpos >= 0) {
+ // Some source control tools don't like it when files containing
+ // lines longer
+ // than, say 8000 characters, are checked in. The linebreak option
+ // is used in
+ // that case to split long lines after a specific column.
+ int i = 0;
+ int linestartpos = 0;
+ sb = new StringBuffer(css);
+ while (i < sb.length()) {
+ char c = sb.charAt(i++);
+ if (c == '}' && i - linestartpos > linebreakpos) {
+ sb.insert(i, '\n');
+ linestartpos = i;
+ }
+ }
+
+ css = sb.toString();
+ }
+
+ // Replace the pseudo class for the Box Model Hack
+ css = css.replaceAll("___PSEUDOCLASSBMH___", "\"\\\\\"}\\\\\"\"");
+
+ // Replace multiple semi-colons in a row by a single one
+ // See SF bug #1980989
+ css = css.replaceAll(";;+", ";");
+
+ // Trim the final string (for any leading or trailing white spaces)
+ css = css.trim();
+
+ // Write the output...
+ out.write(css);
+
+ return css.length();
+ }
}
Modified: trunk/framework/impl/src/test/java/org/ajax4jsf/css/CssCompressorTest.java
===================================================================
--- trunk/framework/impl/src/test/java/org/ajax4jsf/css/CssCompressorTest.java 2008-09-20 00:03:56 UTC (rev 10518)
+++ trunk/framework/impl/src/test/java/org/ajax4jsf/css/CssCompressorTest.java 2008-09-20 16:06:31 UTC (rev 10519)
@@ -7,6 +7,7 @@
package org.ajax4jsf.css;
import java.io.IOException;
+import java.io.StringWriter;
import junit.framework.TestCase;
@@ -81,7 +82,24 @@
}
+ public void testSequentialComments() throws Exception {
+ StringBuffer cssBuffer = new StringBuffer("/* copyright */ body { color: red; } /* abc *//* cde */ html { color: red; } /* copyright end */");
+ CssCompressor compressor = new CssCompressor(cssBuffer);
+ StringWriter stringWriter = new StringWriter();
+ compressor.compress(stringWriter, -1);
+ stringWriter.close();
+ assertEquals("body{color:red;}html{color:red;}", stringWriter.toString());
+ }
-
+ public void testFakeComment() throws Exception {
+ //this test won't go as our CSS compressor is not aware of possible /**/ in url
+
+ //StringBuffer cssBuffer = new StringBuffer("/* copyright */ body { /* my style */ background-image: url(/*/); color: red; background-image: url(/****/); } /* copyright end */");
+ //CssCompressor compressor = new CssCompressor(cssBuffer);
+ //StringWriter stringWriter = new StringWriter();
+ //compressor.compress(stringWriter, -1);
+ //stringWriter.close();
+ //assertEquals("body{background-image:url(/*/);color:red;background-image:url(/****/);}", stringWriter.toString());
+ }
}
15 years, 8 months
JBoss Rich Faces SVN: r10518 - branches/jsf2.0.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-09-19 20:03:56 -0400 (Fri, 19 Sep 2008)
New Revision: 10518
Added:
branches/jsf2.0/framework/
Log:
create JSF 2.0 research branch
Copied: branches/jsf2.0/framework (from rev 10514, trunk/framework)
15 years, 8 months
JBoss Rich Faces SVN: r10517 - branches/jsf2.0/ui.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-09-19 20:03:36 -0400 (Fri, 19 Sep 2008)
New Revision: 10517
Added:
branches/jsf2.0/ui/core/
Log:
create JSF 2.0 research branch
Copied: branches/jsf2.0/ui/core (from rev 10514, trunk/ui/core)
15 years, 8 months
JBoss Rich Faces SVN: r10516 - branches/jsf2.0.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-09-19 20:03:22 -0400 (Fri, 19 Sep 2008)
New Revision: 10516
Added:
branches/jsf2.0/ui/
Log:
create JSF 2.0 research branch
15 years, 8 months
JBoss Rich Faces SVN: r10515 - branches.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-09-19 20:03:18 -0400 (Fri, 19 Sep 2008)
New Revision: 10515
Added:
branches/jsf2.0/
Log:
create JSF 2.0 research branch
15 years, 8 months
JBoss Rich Faces SVN: r10514 - in trunk/test-applications/regressionArea: Seam-ear/.settings and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-09-19 11:55:47 -0400 (Fri, 19 Sep 2008)
New Revision: 10514
Modified:
trunk/test-applications/regressionArea/Seam-ear/.settings/org.eclipse.wst.common.component
trunk/test-applications/regressionArea/Seam-ejb/.classpath
trunk/test-applications/regressionArea/Seam-ejb/.settings/org.eclipse.jdt.core.prefs
trunk/test-applications/regressionArea/Seam-ejb/src/main/resources/META-INF/MANIFEST.MF
trunk/test-applications/regressionArea/Seam-web/.classpath
trunk/test-applications/regressionArea/Seam-web/.settings/org.eclipse.jdt.core.prefs
trunk/test-applications/regressionArea/Seam-web/.settings/org.eclipse.wst.common.component
trunk/test-applications/regressionArea/Seam-web/src/main/resources/META-INF/MANIFEST.MF
trunk/test-applications/regressionArea/readMe.txt
Log:
ReadMe
Modified: trunk/test-applications/regressionArea/Seam-ear/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/test-applications/regressionArea/Seam-ear/.settings/org.eclipse.wst.common.component 2008-09-19 15:51:03 UTC (rev 10513)
+++ trunk/test-applications/regressionArea/Seam-ear/.settings/org.eclipse.wst.common.component 2008-09-19 15:55:47 UTC (rev 10514)
@@ -7,18 +7,9 @@
<dependent-module archiveName="../commons-beanutils-1.7.0.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="../commons-collections-3.2.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module archiveName="../commons-digester-1.8.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
<dependent-module archiveName="../commons-lang-2.3.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="../commons-logging-1.0.4.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
<dependent-module archiveName="../dom4j-1.6.1-jboss.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/dom4j/dom4j/1.6.1-jboss/dom4j-1.6.1-jboss.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
@@ -40,27 +31,15 @@
<dependent-module archiveName="../jsf-facelets-1.1.14.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="../jstl-1.0.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/javax/servlet/jstl/1.0/jstl-1.0.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
<dependent-module archiveName="../log4j-1.2.14.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="../richfaces-api-3.1.4.GA.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/org/richfaces/framework/richfaces-api/3.1.4.GA/richfaces-api-3.1.4.GA.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module archiveName="../richfaces-impl-3.1.4.GA.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/org/richfaces/framework/richfaces-impl/3.1.4.GA/richfaces-impl-3.1.4.GA.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module archiveName="../richfaces-ui-3.1.4.GA.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/org/richfaces/ui/richfaces-ui/3.1.4.GA/richfaces-ui-3.1.4.GA.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
<dependent-module archiveName="Seam-ejb.ejb" deploy-path="/" handle="module:/resource/Seam-ejb/Seam-ejb">
- <dependent-object>EjbModule_28611526</dependent-object>
+ <dependent-object>EjbModule_30524365</dependent-object>
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="Seam-web.war" deploy-path="/" handle="module:/resource/Seam-web/Seam-web">
- <dependent-object>WebModule_5367420</dependent-object>
+ <dependent-object>WebModule_9300874</dependent-object>
<dependency-type>uses</dependency-type>
</dependent-module>
<wb-resource deploy-path="/" source-path="src/main/java"/>
Modified: trunk/test-applications/regressionArea/Seam-ejb/.classpath
===================================================================
--- trunk/test-applications/regressionArea/Seam-ejb/.classpath 2008-09-19 15:51:03 UTC (rev 10513)
+++ trunk/test-applications/regressionArea/Seam-ejb/.classpath 2008-09-19 15:55:47 UTC (rev 10514)
@@ -43,18 +43,16 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-debug/2.0.1.GA/jboss-seam-debug-2.0.1.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-remoting/2.0.1.GA/jboss-seam-remoting-2.0.1.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-ui/2.0.1.GA/jboss-seam-ui-2.0.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-api/1.1_02/jsf-api-1.1_02.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-api/1.2_09/jsf-api-1.2_09.jar" sourcepath="M2_REPO/javax/faces/jsf-api/1.2_09/jsf-api-1.2_09-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.jar" sourcepath="M2_REPO/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-impl/1.1_02/jsf-impl-1.1_02.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.0/jstl-1.0.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.0/jstl-1.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-impl/1.2_09/jsf-impl-1.2_09.jar" sourcepath="M2_REPO/javax/faces/jsf-impl/1.2_09/jsf-impl-1.2_09-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/richfaces/framework/richfaces-api/3.1.4.GA/richfaces-api-3.1.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/richfaces/framework/richfaces-impl/3.1.4.GA/richfaces-impl-3.1.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/richfaces/ui/richfaces-ui/3.1.4.GA/richfaces-ui-3.1.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/richfaces/framework/richfaces-api/3.2.2.GA/richfaces-api-3.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/richfaces/framework/richfaces-impl/3.2.2.GA/richfaces-impl-3.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/richfaces/ui/richfaces-ui/3.2.2.GA/richfaces-ui-3.2.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/testng/testng/5.5/testng-5.5-jdk15.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/embedded/thirdparty-all/beta3/thirdparty-all-beta3.jar"/>
</classpath>
\ No newline at end of file
Modified: trunk/test-applications/regressionArea/Seam-ejb/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/test-applications/regressionArea/Seam-ejb/.settings/org.eclipse.jdt.core.prefs 2008-09-19 15:51:03 UTC (rev 10513)
+++ trunk/test-applications/regressionArea/Seam-ejb/.settings/org.eclipse.jdt.core.prefs 2008-09-19 15:55:47 UTC (rev 10514)
@@ -1,4 +1,4 @@
-#Thu Sep 18 17:10:29 EEST 2008
+#Fri Sep 19 18:53:28 EEST 2008
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
Modified: trunk/test-applications/regressionArea/Seam-ejb/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- trunk/test-applications/regressionArea/Seam-ejb/src/main/resources/META-INF/MANIFEST.MF 2008-09-19 15:51:03 UTC (rev 10513)
+++ trunk/test-applications/regressionArea/Seam-ejb/src/main/resources/META-INF/MANIFEST.MF 2008-09-19 15:55:47 UTC (rev 10514)
@@ -4,7 +4,7 @@
ging-1.0.4.jar dom4j-1.6.1-jboss.jar el-api-1.0.jar javassist-3.3.ga.
jar jboss-el-2.0.1.GA.jar jboss-seam-2.0.1.GA.jar jboss-seam-debug-2.
0.1.GA.jar jboss-seam-remoting-2.0.1.GA.jar jboss-seam-ui-2.0.1.GA.ja
- r jsf-api-1.1_02.jar jsf-facelets-1.1.14.jar jsf-impl-1.1_02.jar jstl
- -1.0.jar log4j-1.2.14.jar richfaces-api-3.1.4.GA.jar richfaces-impl-3
- .1.4.GA.jar richfaces-ui-3.1.4.GA.jar servlet-api-2.4.jar
+ r jsf-api-1.2_09.jar jsf-facelets-1.1.14.jar jsf-impl-1.2_09.jar log4
+ j-1.2.14.jar richfaces-api-3.2.2.GA.jar richfaces-impl-3.2.2.GA.jar r
+ ichfaces-ui-3.2.2.GA.jar
Modified: trunk/test-applications/regressionArea/Seam-web/.classpath
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/.classpath 2008-09-19 15:51:03 UTC (rev 10513)
+++ trunk/test-applications/regressionArea/Seam-web/.classpath 2008-09-19 15:55:47 UTC (rev 10514)
@@ -13,6 +13,7 @@
<classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar">
<attributes>
<attribute value="jar:file:/C:/Documents%20and%20Settings/Andrey/.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-javadoc.jar!/" name="javadoc_location"/>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar">
@@ -20,8 +21,16 @@
<attribute value="jar:file:/C:/Documents%20and%20Settings/Andrey/.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-javadoc.jar!/" name="javadoc_location"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar">
<attributes>
@@ -44,17 +53,28 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-remoting/2.0.1.GA/jboss-seam-remoting-2.0.1.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-ui/2.0.1.GA/jboss-seam-ui-2.0.1.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar" sourcepath="M2_REPO/jline/jline/0.9.94/jline-0.9.94-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-api/1.1_02/jsf-api-1.1_02.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-api/1.2_09/jsf-api-1.2_09.jar" sourcepath="M2_REPO/javax/faces/jsf-api/1.2_09/jsf-api-1.2_09-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.jar" sourcepath="M2_REPO/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-impl/1.1_02/jsf-impl-1.1_02.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.0/jstl-1.0.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.0/jstl-1.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-impl/1.2_09/jsf-impl-1.2_09.jar" sourcepath="M2_REPO/javax/faces/jsf-impl/1.2_09/jsf-impl-1.2_09-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/thoughtworks/qdox/qdox/1.6.3/qdox-1.6.3.jar" sourcepath="M2_REPO/com/thoughtworks/qdox/qdox/1.6.3/qdox-1.6.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/richfaces/framework/richfaces-api/3.1.4.GA/richfaces-api-3.1.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/richfaces/framework/richfaces-impl/3.1.4.GA/richfaces-impl-3.1.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/richfaces/ui/richfaces-ui/3.1.4.GA/richfaces-ui-3.1.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/richfaces/framework/richfaces-api/3.2.2.GA/richfaces-api-3.2.2.GA.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/richfaces/framework/richfaces-impl/3.2.2.GA/richfaces-impl-3.2.2.GA.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/richfaces/ui/richfaces-ui/3.2.2.GA/richfaces-ui-3.2.2.GA.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="src" path="/Seam-ejb"/>
<classpathentry kind="var" path="M2_REPO/org/openqa/selenium/core/selenium-core/1.0-SNAPSHOT/selenium-core-1.0-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/org/openqa/selenium/client-drivers/selenium-java-client-driver/1.0-SNAPSHOT/selenium-java-client-driver-1.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/openqa/selenium/client-drivers/selenium-java-client-driver/1.0-SNAPSHOT/selenium-java-client-driver-1.0-SNAPSHOT-sources.jar"/>
Modified: trunk/test-applications/regressionArea/Seam-web/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/.settings/org.eclipse.jdt.core.prefs 2008-09-19 15:51:03 UTC (rev 10513)
+++ trunk/test-applications/regressionArea/Seam-web/.settings/org.eclipse.jdt.core.prefs 2008-09-19 15:55:47 UTC (rev 10514)
@@ -1,4 +1,4 @@
-#Thu Sep 18 17:10:31 EEST 2008
+#Fri Sep 19 18:53:29 EEST 2008
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
Modified: trunk/test-applications/regressionArea/Seam-web/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/.settings/org.eclipse.wst.common.component 2008-09-19 15:51:03 UTC (rev 10513)
+++ trunk/test-applications/regressionArea/Seam-web/.settings/org.eclipse.wst.common.component 2008-09-19 15:55:47 UTC (rev 10514)
@@ -1,11 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<project-modules id="moduleCoreId" project-version="2.0">
<wb-module deploy-name="Seam-web">
<property name="context-root" value="/Seam"/>
<wb-resource deploy-path="/" source-path="src/main/webapp"/>
<property name="java-output-path" value="/target/classes"/>
+ <dependent-module archiveName="commons-beanutils-1.7.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="commons-collections-3.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="commons-digester-1.8.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="richfaces-api-3.2.2.GA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/richfaces/framework/richfaces-api/3.2.2.GA/richfaces-api-3.2.2.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="richfaces-impl-3.2.2.GA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/richfaces/framework/richfaces-impl/3.2.2.GA/richfaces-impl-3.2.2.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="richfaces-ui-3.2.2.GA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/richfaces/ui/richfaces-ui/3.2.2.GA/richfaces-ui-3.2.2.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
</wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file
Modified: trunk/test-applications/regressionArea/Seam-web/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/resources/META-INF/MANIFEST.MF 2008-09-19 15:51:03 UTC (rev 10513)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/resources/META-INF/MANIFEST.MF 2008-09-19 15:55:47 UTC (rev 10514)
@@ -1,3 +1,5 @@
Manifest-Version: 1.0
-Class-Path:
+Class-Path: commons-beanutils-1.7.0.jar commons-collections-3.2.jar co
+ mmons-digester-1.8.jar richfaces-api-3.2.2.GA.jar richfaces-impl-3.2.
+ 2.GA.jar richfaces-ui-3.2.2.GA.jar
Modified: trunk/test-applications/regressionArea/readMe.txt
===================================================================
--- trunk/test-applications/regressionArea/readMe.txt 2008-09-19 15:51:03 UTC (rev 10513)
+++ trunk/test-applications/regressionArea/readMe.txt 2008-09-19 15:55:47 UTC (rev 10514)
@@ -1,5 +1,11 @@
-1. Define path to JBOSS installed in Seam-web/pom.xml
-2. Build Project: regressionArea/ : mvn clean install
-3. Launch Selenium: regressionArea/Seam-web : mvn integration-test -P Test
+1. Download JBOSS from \\Eltegra-pdc\INCOMING\amarkavtsov\. Unzip.
-P.S. Configuration has not yet completed
\ No newline at end of file
+2. Open regressionArea/pom.xml file. Define there jboss home property.
+
+3. Launch 'build.bat' to build project.
+
+4. Launch 'Test.bat' to start selenium testing.
+
+-----------------------------------------------------
+
+
15 years, 8 months
JBoss Rich Faces SVN: r10513 - in trunk/test-applications/regressionArea/Seam-web/src/main: java/org/ajax4jsf/logging and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-09-19 11:51:03 -0400 (Fri, 19 Sep 2008)
New Revision: 10513
Added:
trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/logging/
trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/logging/PhaseTracker.java
Modified:
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml
Log:
Add Phase Tracker
Added: trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/logging/PhaseTracker.java
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/logging/PhaseTracker.java (rev 0)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/logging/PhaseTracker.java 2008-09-19 15:51:03 UTC (rev 10513)
@@ -0,0 +1,40 @@
+package org.ajax4jsf.logging;
+
+/**
+ *
+ */
+
+
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+
+/**
+ * @author Andrey Markavstov
+ *
+ */
+public class PhaseTracker implements PhaseListener {
+
+ /* (non-Javadoc)
+ * @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent)
+ */
+ public void afterPhase(PhaseEvent arg0) {
+ System.out.println("PhaseTracker.afterPhase()" + arg0.getPhaseId());
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.event.PhaseListener#beforePhase(javax.faces.event.PhaseEvent)
+ */
+ public void beforePhase(PhaseEvent arg0) {
+ System.out.println("PhaseTracker.beforePhase()" + arg0.getPhaseId());
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.event.PhaseListener#getPhaseId()
+ */
+ public PhaseId getPhaseId() {
+ return PhaseId.ANY_PHASE;
+ }
+
+}
Modified: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml 2008-09-19 15:36:11 UTC (rev 10512)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml 2008-09-19 15:51:03 UTC (rev 10513)
@@ -19,5 +19,8 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <lifecycle>
+ <phase-listener id="phaseTracker">org.ajax4jsf.logging.PhaseTracker</phase-listener>
+ </lifecycle>
</faces-config>
\ No newline at end of file
15 years, 8 months
JBoss Rich Faces SVN: r10512 - in trunk/test-applications/regressionArea: Seam-ear and 8 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-09-19 11:36:11 -0400 (Fri, 19 Sep 2008)
New Revision: 10512
Added:
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/001-100/
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/101-200/
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.jsp
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.xhtml
trunk/test-applications/regressionArea/Test.bat
trunk/test-applications/regressionArea/build.bat
Removed:
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/home.xhtml
Modified:
trunk/test-applications/regressionArea/Seam-ear/pom.xml
trunk/test-applications/regressionArea/Seam-ejb/pom.xml
trunk/test-applications/regressionArea/Seam-web/pom.xml
trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/home.xhtml
trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/SimpleTest.java
trunk/test-applications/regressionArea/pom.xml
Log:
Facelets + JSP
Modified: trunk/test-applications/regressionArea/Seam-ear/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-09-19 15:06:53 UTC (rev 10511)
+++ trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-09-19 15:36:11 UTC (rev 10512)
@@ -8,6 +8,7 @@
<artifactId>regressionArea</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
+ <version>1.0-SNAPSHOT</version>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>Seam-ear</artifactId>
<name>Seam App Ear Module</name>
@@ -15,11 +16,6 @@
<dependencies>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>${richversion}</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>Seam-web</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -40,6 +36,18 @@
<artifactId>javassist</artifactId>
<groupId>jboss</groupId>
</exclusion>
+ <exclusion>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -72,6 +80,18 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
Modified: trunk/test-applications/regressionArea/Seam-ejb/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-ejb/pom.xml 2008-09-19 15:06:53 UTC (rev 10511)
+++ trunk/test-applications/regressionArea/Seam-ejb/pom.xml 2008-09-19 15:36:11 UTC (rev 10512)
@@ -21,6 +21,11 @@
<artifactId>jsf-impl</artifactId>
<version>${jsfversion}</version>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>${richversion}</version>
+ </dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
Modified: trunk/test-applications/regressionArea/Seam-web/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-09-19 15:06:53 UTC (rev 10511)
+++ trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-09-19 15:36:11 UTC (rev 10512)
@@ -12,6 +12,33 @@
<packaging>war</packaging>
<dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>${richversion}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${richversion}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>${richversion}</version>
+ </dependency>
<dependency>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>Seam-ejb</artifactId>
Modified: trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-09-19 15:06:53 UTC (rev 10511)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-09-19 15:36:11 UTC (rev 10512)
@@ -58,7 +58,7 @@
* @return the template
*/
public String getTemplate() {
- return "../template/" + template.getName() + ".xhtml";
+ return "../../template/" + template.getName() + ".xhtml";
}
/**
Modified: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml 2008-09-19 15:06:53 UTC (rev 10511)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml 2008-09-19 15:36:11 UTC (rev 10512)
@@ -2,9 +2,9 @@
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
- <application>
+ <!-- application>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
- </application>
+ </application-->
<managed-bean>
Modified: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/web.xml 2008-09-19 15:06:53 UTC (rev 10511)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/web.xml 2008-09-19 15:36:11 UTC (rev 10512)
@@ -21,6 +21,24 @@
</context-param>
<context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.jsp</param-value>
+ </context-param>
+
+
+ <context-param>
+ <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-value>*xhtml</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+
+
+
+ <context-param>
<param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
<param-value>NONE,TIDY,NEKO</param-value>
</context-param>
@@ -88,11 +106,7 @@
<param-value>true</param-value>
</context-param>
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
-
+
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@@ -101,14 +115,9 @@
<!-- Faces Servlet Mapping -->
+
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.seam</url-pattern>
- </servlet-mapping>
-
-
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
<url-pattern>/faces/NEKO/*</url-pattern>
</servlet-mapping>
Modified: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/home.xhtml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/home.xhtml 2008-09-19 15:06:53 UTC (rev 10511)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/home.xhtml 2008-09-19 15:36:11 UTC (rev 10512)
@@ -14,16 +14,7 @@
<body id="pgHome">
<f:view>
<h:form id="_form">
- <rich:panel header="Rich Users">
- <rich:dataTable id="tb" value="#{usersBean.users}" var="us">
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Name"></h:outputText>
- </f:facet>
- <h:outputText value="#{us.name}"></h:outputText>
- </rich:column>
- </rich:dataTable>
- </rich:panel>
+ Successfull
</h:form>
</f:view>
</body>
Added: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.jsp
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.jsp (rev 0)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.jsp 2008-09-19 15:36:11 UTC (rev 10512)
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<title>Resression Area : Seam Application</title>
+</head>
+<body id="pgHome">
+<f:view>
+ <h:form id="_form">
+ <rich:panel header="Rich Users">
+ <rich:dataTable id="tb" value="#{usersBean.users}" var="us">
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Name"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{us.name}"></h:outputText>
+ </rich:column>
+ </rich:dataTable>
+ </rich:panel>
+ </h:form>
+</f:view>
+</body>
+</html>
Added: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.xhtml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.xhtml (rev 0)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.xhtml 2008-09-19 15:36:11 UTC (rev 10512)
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j">
+
+<ui:composition template="#{templateBean.template}">
+ <ui:define name="style">
+
+ </ui:define>
+ <ui:define name="component">
+ <rich:panel header="Rich Users">
+ <rich:dataTable id="tb" value="#{usersBean.users}" var="us">
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Name"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{us.name}"></h:outputText>
+ </rich:column>
+ </rich:dataTable>
+ </rich:panel>
+ </ui:define>
+</ui:composition>
+</html>
Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/home.xhtml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/home.xhtml 2008-09-19 15:06:53 UTC (rev 10511)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/home.xhtml 2008-09-19 15:36:11 UTC (rev 10512)
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:s="http://jboss.com/products/seam/taglib"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:rich="http://richfaces.org/rich"
- xmlns:a4j="http://richfaces.org/a4j">
-
-<ui:composition template="#{templateBean.template}">
- <ui:define name="style">
-
- </ui:define>
- <ui:define name="component">
- <rich:panel header="Rich Users">
- <rich:dataTable id="tb" value="#{usersBean.users}" var="us">
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Name"></h:outputText>
- </f:facet>
- <h:outputText value="#{us.name}"></h:outputText>
- </rich:column>
- </rich:dataTable>
- </rich:panel>
- </ui:define>
-</ui:composition>
-</html>
Modified: trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/SimpleTest.java
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/SimpleTest.java 2008-09-19 15:06:53 UTC (rev 10511)
+++ trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/SimpleTest.java 2008-09-19 15:36:11 UTC (rev 10512)
@@ -4,19 +4,24 @@
import org.richfaces.SeleniumTestBase;
import org.testng.annotations.Test;
-public class SimpleTest extends SeleniumTestBase{
-
- @Test
- public void testAjaxActionParameterComponent(Template template) {
- renderPage(template);
- String parentId = getParentId();
-
- }
+public class SimpleTest extends SeleniumTestBase {
-
- @Override
- public String getTestUrl() {
- return "pages/home.xhtml";
- }
+ @Test
+ public void testXHTML(Template template) {
+ renderPage(template);
+ }
+
+ @Test
+ public void testJSP(Template template) {
+ selenium.open("http://localhost:" + serverPort + "/" + APPLICATION_NAME + "/faces/NEKO/pages/examples/home.jsp");
+ waitForPageToLoad();
+
+ }
+
+ @Override
+ public String getTestUrl() {
+ return "pages/examples/home.xhtml";
+ }
+
}
Added: trunk/test-applications/regressionArea/Test.bat
===================================================================
--- trunk/test-applications/regressionArea/Test.bat (rev 0)
+++ trunk/test-applications/regressionArea/Test.bat 2008-09-19 15:36:11 UTC (rev 10512)
@@ -0,0 +1,2 @@
+cd /Seam-web
+mvn integration-test -P Test
\ No newline at end of file
Added: trunk/test-applications/regressionArea/build.bat
===================================================================
--- trunk/test-applications/regressionArea/build.bat (rev 0)
+++ trunk/test-applications/regressionArea/build.bat 2008-09-19 15:36:11 UTC (rev 10512)
@@ -0,0 +1 @@
+mvn clean install
\ No newline at end of file
Modified: trunk/test-applications/regressionArea/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/pom.xml 2008-09-19 15:06:53 UTC (rev 10511)
+++ trunk/test-applications/regressionArea/pom.xml 2008-09-19 15:36:11 UTC (rev 10512)
@@ -23,7 +23,7 @@
<properties>
<contextroot>Seam</contextroot>
- <earname>Seam-${version}</earname>
+ <earname>Seam-ear-${version}</earname>
<richversion>3.2.2.GA</richversion>
<seamversion>2.0.1.GA</seamversion>
<jsfversion>1.2_09</jsfversion>
@@ -31,6 +31,24 @@
<jbosscontext>default</jbosscontext>
</properties>
+<!--dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>${richversion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${richversion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>${richversion}</version>
+ </dependency>
+
+ </dependencies-->
<modules>
<module>Seam-ejb</module>
15 years, 8 months
JBoss Rich Faces SVN: r10511 - trunk/sandbox/ui/editor/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-09-19 11:06:53 -0400 (Fri, 19 Sep 2008)
New Revision: 10511
Modified:
trunk/sandbox/ui/editor/src/main/java/org/richfaces/component/TinyMceLoaderServlet.java
Log:
Adjust servlet code in Editor
Modified: 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-09-19 15:04:56 UTC (rev 10510)
+++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/component/TinyMceLoaderServlet.java 2008-09-19 15:06:53 UTC (rev 10511)
@@ -21,7 +21,7 @@
* @author Alexandr Levkovsky
*
*/
-public class TinyMceLoaderServlet extends javax.servlet.http.HttpServlet implements javax.servlet.Servlet {
+public class TinyMceLoaderServlet extends javax.servlet.http.HttpServlet {
private static final long serialVersionUID = 1L;
protected final Log logger = LogFactory.getLog(getClass());
15 years, 8 months
JBoss Rich Faces SVN: r10510 - trunk/sandbox/ui/editor/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-09-19 11:04:56 -0400 (Fri, 19 Sep 2008)
New Revision: 10510
Modified:
trunk/sandbox/ui/editor/src/main/java/org/richfaces/component/TinyMceLoaderServlet.java
Log:
Adjust servlet code in Editor
Modified: 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-09-19 14:35:17 UTC (rev 10509)
+++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/component/TinyMceLoaderServlet.java 2008-09-19 15:04:56 UTC (rev 10510)
@@ -12,20 +12,24 @@
import org.apache.commons.logging.LogFactory;
/**
- * Servlet implementation class for Servlet: TinyMCELoaderServlet
+ * Servlet for loading TinyMCE resources
*
* @web.servlet name="TinyMCELoaderServlet" display-name="TinyMCE Loader Servlet"
*
- * @web.servlet-mapping url-pattern="/org/richfaces/renderkit/html/scripts/tiny_mce/*"
+ * @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 implements javax.servlet.Servlet {
- private static final long serialVersionUID = 2134922212552082105L;
+ 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 path = "org/richfaces/renderkit/html/scripts/tiny_mce" + request.getPathInfo();
+ String path = TINYMCE_RESOURCES_LOCATION + request.getPathInfo();
try {
copyFileToOutput(path, response.getOutputStream());
@@ -36,19 +40,24 @@
}
- /** Opens Input Stream for
- *
+ /**
+ * Open input stream using path to file
* @param path
* @return
*/
- public InputStream getFileStream(String path) {
+ private InputStream getFileStream(String path) {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
InputStream is = cl.getResourceAsStream(path);
return is;
}
- public void copyFileToOutput(String path, OutputStream os) {
+ /**
+ * Copies file to output stream
+ * @param path
+ * @param os
+ */
+ private void copyFileToOutput(String path, OutputStream os) {
InputStream is = getFileStream(path);
try {
15 years, 8 months