Author: alexsmirnov Date: 2007-09-25 18:04:33 -0400 (Tue, 25 Sep 2007) New Revision: 3112 Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/ParserConfig.java trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java trunk/pom.xml Log: change repositories id's to repository/snapshots.jboss.org Fix version number. Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java 2007-09-25 17:33:34 UTC (rev 3111) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java 2007-09-25 22:04:33 UTC (rev 3112) @@ -63,4 +63,8 @@ return serializedView; } + public boolean isSavingStateInClient(FacesContext context) { + // Client side view saving is not applicable for portal. + return false; + } } Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/ParserConfig.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/ParserConfig.java 2007-09-25 17:33:34 UTC (rev 3111) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/ParserConfig.java 2007-09-25 22:04:33 UTC (rev 3112) @@ -8,60 +8,68 @@ abstract class ParserConfig { - private static final Pattern[] ALL_VIEWS_PATTERN = { Pattern.compile(".*") }; - - private static final Pattern SEPARATOR_PATTERN = Pattern.compile("\\s*,\\s*"); + private static final Pattern[] ALL_VIEWS_PATTERN = { Pattern.compile(".*") }; - private Pattern[] patterns = ALL_VIEWS_PATTERN; + private static final Pattern SEPARATOR_PATTERN = Pattern + .compile("\\s*,\\s*"); - private ParserConfig next; + private Pattern[] patterns = ALL_VIEWS_PATTERN; - protected abstract HtmlParser createParser(String mimetype); + private ParserConfig next; - boolean storeParser(HtmlParser parser) { - return false; - } + protected abstract HtmlParser createParser(String mimetype); - HtmlParser getParser(String viewId, String mimetype) { - HtmlParser result = null; - for (int i = 0; i < patterns.length && null == result; i++) { - Matcher matcher = patterns[i].matcher(viewId); - if (matcher.matches()) { - result = createParser(mimetype); - } + boolean storeParser(HtmlParser parser) { + return false; } - if (null == result && null != next) { - result = next.getParser(viewId, mimetype); + + HtmlParser getParser(String viewId, String mimetype) { + HtmlParser result = null; + if (null != viewId) { + for (int i = 0; i < patterns.length && null == result; i++) { + Matcher matcher = patterns[i].matcher(viewId); + if (matcher.matches()) { + result = createParser(mimetype); + } + } + + } + if (null == result) { + if (null != next) { + result = next.getParser(viewId, mimetype); + } else { + result = createParser(mimetype); + } + } + return result; } - return result; - } - public void reuseParser(HtmlParser parser) { - if (!storeParser(parser) && null != next) { - next.reuseParser(parser); + public void reuseParser(HtmlParser parser) { + if (!storeParser(parser) && null != next) { + next.reuseParser(parser); + } } - } - public ParserConfig getNext() { - return next; - } + public ParserConfig getNext() { + return next; + } - public void setNext(ParserConfig next) { - this.next = next; - } + public void setNext(ParserConfig next) { + this.next = next; + } - public void setPatterns(String patternsString) { - if (null != patternsString) { - String[] split = SEPARATOR_PATTERN.split(patternsString); - patterns = new Pattern[split.length]; - for (int i = 0; i < split.length; i++) { - patterns[i]=Pattern.compile(split[i].trim()); - } - } - } + public void setPatterns(String patternsString) { + if (null != patternsString) { + String[] split = SEPARATOR_PATTERN.split(patternsString); + patterns = new Pattern[split.length]; + for (int i = 0; i < split.length; i++) { + patterns[i] = Pattern.compile(split[i].trim()); + } + } + } - public Pattern[] getPatterns() { - return patterns; - } + public Pattern[] getPatterns() { + return patterns; + } } \ No newline at end of file Modified: trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2007-09-25 17:33:34 UTC (rev 3111) +++ trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2007-09-25 22:04:33 UTC (rev 3112) @@ -30,7 +30,7 @@ public class VersionBean { public static final String VENDOR = "richfaces.org"; public static final int MAJOR_VERSION = 3; - public static final int MINOR_VERSION = 1; + public static final int MINOR_VERSION = 2; public static final String PROJECT_NAME = "Jboss Richfaces"; /** Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-09-25 17:33:34 UTC (rev 3111) +++ trunk/pom.xml 2007-09-25 22:04:33 UTC (rev 3112) @@ -6,6 +6,9 @@ <name>Jboss RichFaces project</name> <version>3.2.0-SNAPSHOT</version> <url>http://labs.jboss.com/jbossrichfaces</url> + <properties> + <snapshotRepository>dav:https://snapshots.jboss.org/maven2</snapshot... + </properties> <dependencies /> <build> <extensions> @@ -48,12 +51,12 @@ http://labs.jboss.com/portal/jbossrichfaces/downloads </downloadUrl> <repository> - <id>release-repository</id> + <id>repository.jboss.org</id> <uniqueVersion>false</uniqueVersion> <url>${releaseRepository}</url> </repository> <snapshotRepository> - <id>snap-repository</id> + <id>snapshots.jboss.org</id> <uniqueVersion>true</uniqueVersion> <url>${snapshotRepository}</url> </snapshotRepository>