[sitemesh/sitemesh3] 9adb29: Fixes #27

4 views
Skip to first unread message

GitHub

unread,
Aug 22, 2013, 6:13:23 PM8/22/13
to siteme...@googlegroups.com
Branch: refs/heads/master
Home: https://github.com/sitemesh/sitemesh3
Commit: 9adb29e308ac39993c9f4568c9d2cfbf88e03573
https://github.com/sitemesh/sitemesh3/commit/9adb29e308ac39993c9f4568c9d2cfbf88e03573
Author: Scott Murphy <sc...@alwaysvip.com>
Date: 2012-04-14 (Sat, 14 Apr 2012)

Changed paths:
M sitemesh/src/main/java/org/sitemesh/webapp/SiteMeshFilter.java

Log Message:
-----------
Fixes #27


Commit: 47e0c338c73cab68efd6b02751620afdaf7a5f16
https://github.com/sitemesh/sitemesh3/commit/47e0c338c73cab68efd6b02751620afdaf7a5f16
Author: Scott Murphy <sc...@alwaysvip.com>
Date: 2013-08-22 (Thu, 22 Aug 2013)

Changed paths:
M .gitignore
A build.gradle
A gradle/wrapper/gradle-wrapper.jar
A gradle/wrapper/gradle-wrapper.properties
A gradlew
A gradlew.bat
A settings.gradle
A sitemesh-examples-gradle-hello/.gitignore
A sitemesh-examples-gradle-hello/README.md
A sitemesh-examples-gradle-hello/WEB-INF/sitemesh3.xml
A sitemesh-examples-gradle-hello/WEB-INF/web.xml
A sitemesh-examples-gradle-hello/build.gradle
A sitemesh-examples-gradle-hello/decorator.html
A sitemesh-examples-gradle-hello/hello.html
M sitemesh-examples-hellowebapp/.gitignore
A sitemesh-examples-hellowebapp/build.gradle
M sitemesh/.gitignore
A sitemesh/build.gradle
M sitemesh/src/main/java/org/sitemesh/BaseSiteMeshContext.java
M sitemesh/src/main/java/org/sitemesh/SiteMeshContext.java
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/content/tagrules/html/CoreHtmlTagRuleBundle.java
M sitemesh/src/main/java/org/sitemesh/content/tagrules/html/ExportTagToContentRule.java
M sitemesh/src/main/java/org/sitemesh/content/tagrules/msoffice/MsOfficeTagRuleBundle.java
A sitemesh/src/main/java/org/sitemesh/tagprocessor/.gitignore
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/SiteMeshContextStub.java
M sitemesh/src/test/java/org/sitemesh/acceptance/basicpagedecorator/BasicPageDecoratorTest.java
A sitemesh/src/test/java/org/sitemesh/acceptance/basicpagedecorator/expected/write1.html
R sitemesh/src/test/java/org/sitemesh/acceptance/basicpagedecorator/input/decorator.html
A sitemesh/src/test/java/org/sitemesh/acceptance/basicpagedecorator/input/hello-decorator.html
A sitemesh/src/test/java/org/sitemesh/acceptance/basicpagedecorator/input/write-decorator.html
A sitemesh/src/test/java/org/sitemesh/acceptance/basicpagedecorator/input/write1.html
M sitemesh/src/test/java/org/sitemesh/config/PathMapperTest.java
M sitemesh/src/test/java/org/sitemesh/content/tagrules/decorate/SiteMeshWriteRuleTest.java
M sitemesh/src/test/java/org/sitemesh/html/DataDrivenSuiteBuilder.java
M sitemesh/src/test/java/org/sitemesh/html/testdata/test25.txt
M sitemesh/src/test/java/org/sitemesh/html/testdata/test29.txt
M sitemesh/src/test/java/org/sitemesh/html/testdata/test30.txt
M sitemesh/src/test/java/org/sitemesh/html/testdata/test32.txt
M sitemesh/src/test/java/org/sitemesh/html/testdata/test44.txt
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:
-----------
Merged upstream


Commit: e6b0d3a59acf546ab619782bc464e785eab8a00b
https://github.com/sitemesh/sitemesh3/commit/e6b0d3a59acf546ab619782bc464e785eab8a00b
Author: Scott Murphy <sc...@alwaysvip.com>
Date: 2013-08-22 (Thu, 22 Aug 2013)

Changed paths:
M pom.xml
M sitemesh/src/main/java/org/sitemesh/config/xml/XmlConfigurator.java

Log Message:
-----------
minor fix


Commit: 3f92e51304c222ba8f6fba1bbe9606beb242534e
https://github.com/sitemesh/sitemesh3/commit/3f92e51304c222ba8f6fba1bbe9606beb242534e
Author: Scott Murphy <sc...@peoplepedia.org>
Date: 2013-08-22 (Thu, 22 Aug 2013)

Changed paths:
M pom.xml
M sitemesh/src/main/java/org/sitemesh/config/xml/XmlConfigurator.java
M sitemesh/src/main/java/org/sitemesh/webapp/SiteMeshFilter.java

Log Message:
-----------
Merge pull request #51 from codeconsole/master

Minor updates


Compare: https://github.com/sitemesh/sitemesh3/compare/4407ee3448bd...3f92e51304c2
Reply all
Reply to author
Forward
0 new messages