[sitemesh/sitemesh3] df71e9: if there is exclude rule and decorator rule the mo...

[GitHub]

Branch: refs/heads/master
Home: https://github.com/sitemesh/sitemesh3
Commit: df71e988efec0ceb8b9b07c2779c6926ab1f0035
https://github.com/sitemesh/sitemesh3/commit/df71e988efec0ceb8b9b07c2779c6926ab1f0035
Author: Vladimir Orany <vlad...@orany.cz>
Date: 2013-08-09 (Fri, 09 Aug 2013)

Changed paths:
M sitemesh/src/main/java/org/sitemesh/builder/BaseSiteMeshFilterBuilder.java
M sitemesh/src/main/java/org/sitemesh/config/PathBasedDecoratorSelector.java
M sitemesh/src/main/java/org/sitemesh/config/PathMapper.java
M sitemesh/src/main/java/org/sitemesh/webapp/SiteMeshFilter.java
M sitemesh/src/main/java/org/sitemesh/webapp/WebAppContext.java
M sitemesh/src/main/java/org/sitemesh/webapp/contentfilter/BasicSelector.java
M sitemesh/src/main/java/org/sitemesh/webapp/contentfilter/ContentBufferingFilter.java
M sitemesh/src/main/java/org/sitemesh/webapp/contentfilter/Selector.java
M sitemesh/src/test/java/org/sitemesh/webapp/SiteMeshFilterTest.java
M sitemesh/src/test/java/org/sitemesh/webapp/WebAppContextTest.java
M sitemesh/src/test/java/org/sitemesh/webapp/contentfilter/ContentBufferingFilterTest.java

Log Message:
-----------
if there is exclude rule and decorator rule the more specific one wins


Commit: 545618ba3b87f13bdde15d9da887047fb2d08f76
https://github.com/sitemesh/sitemesh3/commit/545618ba3b87f13bdde15d9da887047fb2d08f76
Author: Vladimir Orany <vlad...@orany.cz>
Date: 2013-08-09 (Fri, 09 Aug 2013)

Changed paths:
M sitemesh/src/main/java/org/sitemesh/config/PathMapper.java
M sitemesh/src/main/java/org/sitemesh/webapp/contentfilter/BasicSelector.java
M sitemesh/src/test/java/org/sitemesh/config/PathMapperTest.java

Log Message:
-----------
few more tests, if both exclude and decorater pattern are complex, the longer wins as in case of other complex patterns


Commit: 15d200b6d3ac5f01b1a3d311ce222a7a66f84c65
https://github.com/sitemesh/sitemesh3/commit/15d200b6d3ac5f01b1a3d311ce222a7a66f84c65
Author: Scott Murphy <sc...@peoplepedia.org>
Date: 2013-08-12 (Mon, 12 Aug 2013)

Changed paths:
M sitemesh/src/main/java/org/sitemesh/builder/BaseSiteMeshFilterBuilder.java
M sitemesh/src/main/java/org/sitemesh/config/PathBasedDecoratorSelector.java
M sitemesh/src/main/java/org/sitemesh/config/PathMapper.java
M sitemesh/src/main/java/org/sitemesh/webapp/SiteMeshFilter.java
M sitemesh/src/main/java/org/sitemesh/webapp/WebAppContext.java
M sitemesh/src/main/java/org/sitemesh/webapp/contentfilter/BasicSelector.java
M sitemesh/src/main/java/org/sitemesh/webapp/contentfilter/ContentBufferingFilter.java
M sitemesh/src/main/java/org/sitemesh/webapp/contentfilter/Selector.java
M sitemesh/src/test/java/org/sitemesh/config/PathMapperTest.java
M sitemesh/src/test/java/org/sitemesh/webapp/SiteMeshFilterTest.java
M sitemesh/src/test/java/org/sitemesh/webapp/WebAppContextTest.java
M sitemesh/src/test/java/org/sitemesh/webapp/contentfilter/ContentBufferingFilterTest.java

Log Message:
-----------
Merge pull request #48 from musketyr/master

if there is exclude rule and decorator rule the more specific one wins


Compare: https://github.com/sitemesh/sitemesh3/compare/803a1f7d63e2...15d200b6d3ac