[sitemesh/sitemesh2] e50fec: Added chained buffers.

22 views
Skip to first unread message

nor...@github.com

unread,
Aug 14, 2011, 4:52:47 PM8/14/11
to siteme...@googlegroups.com
Branch: refs/heads/master
Home: https://github.com/sitemesh/sitemesh2

Commit: e50fec8396f093203e3de0372a064139e30e93cc
https://github.com/sitemesh/sitemesh2/commit/e50fec8396f093203e3de0372a064139e30e93cc
Author: James Roper <jro...@gmail.com>
Date: 2011-07-02 (Sat, 02 Jul 2011)

Changed paths:
M .gitignore
A src/java/com/opensymphony/module/sitemesh/DefaultSitemeshBuffer.java
M src/java/com/opensymphony/module/sitemesh/PageParser.java
A src/java/com/opensymphony/module/sitemesh/SitemeshBuffer.java
A src/java/com/opensymphony/module/sitemesh/SitemeshBufferFragment.java
A src/java/com/opensymphony/module/sitemesh/SitemeshBufferWriter.java
A src/java/com/opensymphony/module/sitemesh/SitemeshWriter.java
M src/java/com/opensymphony/module/sitemesh/filter/Buffer.java
M src/java/com/opensymphony/module/sitemesh/filter/BufferedContent.java
M src/java/com/opensymphony/module/sitemesh/filter/PageResponseWrapper.java
M src/java/com/opensymphony/module/sitemesh/filter/RoutablePrintWriter.java
A src/java/com/opensymphony/module/sitemesh/filter/SitemeshPrintWriter.java
M src/java/com/opensymphony/module/sitemesh/multipass/MultipassReplacementPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/FastPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/HTMLPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/SuperFastHtmlPage.java
M src/java/com/opensymphony/module/sitemesh/parser/SuperFastPage.java
M src/java/com/opensymphony/module/sitemesh/parser/SuperFastSimplePageParser.java
M src/java/com/opensymphony/module/sitemesh/taglib/page/ApplyDecoratorTag.java
M src/java/com/opensymphony/sitemesh/ContentProcessor.java
M src/java/com/opensymphony/sitemesh/compatability/PageParser2ContentProcessor.java
M src/java/com/opensymphony/sitemesh/webapp/ContentBufferingResponse.java
A src/test/com/opensymphony/module/sitemesh/chaining/ChainingBufferTest.java
M src/test/com/opensymphony/module/sitemesh/multipass/DivExtractingPageParserTest.java
M src/test/com/opensymphony/module/sitemesh/parser/HTMLPageParserTest.java
M src/test/com/opensymphony/module/sitemesh/parser/ParserPerformanceComparison.java

Log Message:
-----------
Added chained buffers.


Commit: 10c0fb0c1339a03edff6cbbf3392c6e1cab67176
https://github.com/sitemesh/sitemesh2/commit/10c0fb0c1339a03edff6cbbf3392c6e1cab67176
Author: James Roper <ja...@jazzy.id.au>
Date: 2011-07-02 (Sat, 02 Jul 2011)

Changed paths:
M src/java/com/opensymphony/module/sitemesh/DefaultSitemeshBuffer.java
M src/test/com/opensymphony/module/sitemesh/chaining/ChainingBufferTest.java

Log Message:
-----------
Finished unit tests for chained buffers


Commit: 7e8206e611ea941ddebb67994127b7ef64de80fa
https://github.com/sitemesh/sitemesh2/commit/7e8206e611ea941ddebb67994127b7ef64de80fa
Author: James Roper <jro...@gmail.com>
Date: 2011-07-04 (Mon, 04 Jul 2011)

Changed paths:
M src/java/com/opensymphony/module/sitemesh/DefaultSitemeshBuffer.java
M src/java/com/opensymphony/module/sitemesh/SitemeshBufferFragment.java
A src/java/com/opensymphony/module/sitemesh/SitemeshBufferFragmentDeletion.java
M src/test/com/opensymphony/module/sitemesh/chaining/ChainingBufferTest.java

Log Message:
-----------
Added support for buffer deletions


Commit: 606b972b21d70c9314143ea51602411836ba2010
https://github.com/sitemesh/sitemesh2/commit/606b972b21d70c9314143ea51602411836ba2010
Author: James Roper <jro...@gmail.com>
Date: 2011-07-04 (Mon, 04 Jul 2011)

Changed paths:
M src/java/com/opensymphony/module/sitemesh/DefaultSitemeshBuffer.java
M src/test/com/opensymphony/module/sitemesh/chaining/ChainingBufferTest.java

Log Message:
-----------
Merged changes


Commit: ae5c55cc64d7a93612ef81a9ea5ccefac9e17c3e
https://github.com/sitemesh/sitemesh2/commit/ae5c55cc64d7a93612ef81a9ea5ccefac9e17c3e
Author: James Roper <jro...@gmail.com>
Date: 2011-07-05 (Tue, 05 Jul 2011)

Changed paths:
M src/java/com/opensymphony/module/sitemesh/DefaultSitemeshBuffer.java
M src/java/com/opensymphony/module/sitemesh/SitemeshBufferFragment.java
R src/java/com/opensymphony/module/sitemesh/SitemeshBufferFragmentDeletion.java
M src/java/com/opensymphony/module/sitemesh/SitemeshBufferWriter.java
M src/java/com/opensymphony/module/sitemesh/SitemeshWriter.java
R src/java/com/opensymphony/module/sitemesh/filter/BufferedContent.java
M src/java/com/opensymphony/module/sitemesh/filter/RoutablePrintWriter.java
M src/java/com/opensymphony/module/sitemesh/filter/SitemeshPrintWriter.java
M src/java/com/opensymphony/module/sitemesh/html/BasicRule.java
M src/java/com/opensymphony/module/sitemesh/html/BlockExtractingRule.java
M src/java/com/opensymphony/module/sitemesh/html/CustomTag.java
M src/java/com/opensymphony/module/sitemesh/html/HTMLProcessor.java
M src/java/com/opensymphony/module/sitemesh/html/HTMLProcessorContext.java
M src/java/com/opensymphony/module/sitemesh/html/State.java
M src/java/com/opensymphony/module/sitemesh/html/StateTransitionRule.java
M src/java/com/opensymphony/module/sitemesh/html/Tag.java
M src/java/com/opensymphony/module/sitemesh/html/Text.java
M src/java/com/opensymphony/module/sitemesh/html/rules/BodyTagRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/ContentBlockExtractingRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/FramesetRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/HeadExtractingRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/HtmlAttributesRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/MSOfficeDocumentPropertiesRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/MetaTagRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/ParameterExtractingRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/TagReplaceRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/TitleExtractingRule.java
M src/java/com/opensymphony/module/sitemesh/html/tokenizer/Parser.java
M src/java/com/opensymphony/module/sitemesh/html/tokenizer/TagTokenizer.java
A src/java/com/opensymphony/module/sitemesh/html/util/StringSitemeshBuffer.java
M src/java/com/opensymphony/module/sitemesh/multipass/DivExtractingPageParser.java
M src/java/com/opensymphony/module/sitemesh/multipass/MultipassReplacementPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/AbstractHTMLPage.java
M src/java/com/opensymphony/module/sitemesh/parser/AbstractPage.java
M src/java/com/opensymphony/module/sitemesh/parser/FastPage.java
M src/java/com/opensymphony/module/sitemesh/parser/FastPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/HTMLPageParser.java
A src/java/com/opensymphony/module/sitemesh/parser/PartialPageParser.java
A src/java/com/opensymphony/module/sitemesh/parser/PartialPageParserHtmlPage.java
A src/java/com/opensymphony/module/sitemesh/parser/PartialPageParserPage.java
R src/java/com/opensymphony/module/sitemesh/parser/SuperFastHtmlPage.java
R src/java/com/opensymphony/module/sitemesh/parser/SuperFastPage.java
M src/java/com/opensymphony/module/sitemesh/parser/SuperFastSimplePageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/TokenizedHTMLPage.java
M src/parser-tests/parsers.properties
M src/parser-tests/test10.txt
M src/test/com/opensymphony/module/sitemesh/chaining/ChainingBufferTest.java
M src/test/com/opensymphony/module/sitemesh/html/HTMLProcessorTest.java
M src/test/com/opensymphony/module/sitemesh/html/rules/RegexReplacementTextFilterTest.java
M src/test/com/opensymphony/module/sitemesh/parser/ParserPerformanceComparison.java

Log Message:
-----------
Converted HTMLPageParser to use a single buffer


Commit: 7a6863ca5d86b8ce3f35b372e53c9cccf2f61923
https://github.com/sitemesh/sitemesh2/commit/7a6863ca5d86b8ce3f35b372e53c9cccf2f61923
Author: James Roper <jro...@gmail.com>
Date: 2011-07-05 (Tue, 05 Jul 2011)

Changed paths:
M pom.xml
M src/java/com/opensymphony/sitemesh/ContentProcessor.java
M src/java/com/opensymphony/sitemesh/compatability/PageParser2ContentProcessor.java
M src/java/com/opensymphony/sitemesh/webapp/ContentBufferingResponse.java
A target/pom-transformed.xml

Log Message:
-----------
Removed imports that broke stuff


Commit: 91035a96f2defd1e24b31801fb5bb83338874be3
https://github.com/sitemesh/sitemesh2/commit/91035a96f2defd1e24b31801fb5bb83338874be3
Author: James Roper <jro...@gmail.com>
Date: 2011-07-05 (Tue, 05 Jul 2011)

Changed paths:
M pom.xml
R target/pom-transformed.xml

Log Message:
-----------
Preparing for release of 2.5-atlassian-1


Commit: dab543008f4d7ebd4ba8fcdd689ec118d4a404da
https://github.com/sitemesh/sitemesh2/commit/dab543008f4d7ebd4ba8fcdd689ec118d4a404da
Author: James Roper <jro...@gmail.com>
Date: 2011-07-05 (Tue, 05 Jul 2011)

Changed paths:
M build.properties

Log Message:
-----------
Updated version


Commit: 8bbb5502ebb75fd6fa815d2b83e5752fcf2f9e4f
https://github.com/sitemesh/sitemesh2/commit/8bbb5502ebb75fd6fa815d2b83e5752fcf2f9e4f
Author: James Roper <jro...@gmail.com>
Date: 2011-07-11 (Mon, 11 Jul 2011)

Changed paths:
M src/java/com/opensymphony/module/sitemesh/DefaultSitemeshBuffer.java
M src/java/com/opensymphony/module/sitemesh/PageParser.java
M src/java/com/opensymphony/module/sitemesh/SitemeshBufferFragment.java
M src/java/com/opensymphony/module/sitemesh/html/BasicRule.java
M src/java/com/opensymphony/module/sitemesh/html/CustomTag.java
M src/java/com/opensymphony/module/sitemesh/multipass/MultipassReplacementPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/FastPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/HTMLPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/PartialPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/TokenizedHTMLPage.java
M src/test/com/opensymphony/module/sitemesh/html/HTMLProcessorTest.java
M src/test/com/opensymphony/module/sitemesh/html/rules/RegexReplacementTextFilterTest.java
M src/test/com/opensymphony/module/sitemesh/parser/HTMLPageParserTest.java

Log Message:
-----------
Readded deprecated parse() method to PageParser, and added getStringContent() method to buffer fragments so that toString() could safely be used in other contexts


Commit: 2ec48b2ee571806e2eca2b9c1a641b9a12206308
https://github.com/sitemesh/sitemesh2/commit/2ec48b2ee571806e2eca2b9c1a641b9a12206308
Author: James Roper <jro...@gmail.com>
Date: 2011-07-11 (Mon, 11 Jul 2011)

Changed paths:
M CHANGES.txt
M build.properties
M pom.xml

Log Message:
-----------
Update for release of 2.5-atlassian-2


Commit: 4fcde51c60dfa43b60884291cb68e70851255b94
https://github.com/sitemesh/sitemesh2/commit/4fcde51c60dfa43b60884291cb68e70851255b94
Author: Matt Quail <sp...@madbean.com>
Date: 2011-07-13 (Wed, 13 Jul 2011)

Changed paths:
M .gitignore
M build.properties
M pom.xml
M src/java/com/opensymphony/module/sitemesh/Page.java
M src/java/com/opensymphony/module/sitemesh/parser/AbstractPage.java
M src/java/com/opensymphony/sitemesh/Content.java
M src/java/com/opensymphony/sitemesh/compatability/Content2HTMLPage.java
M src/java/com/opensymphony/sitemesh/compatability/HTMLPage2Content.java
M src/java/com/opensymphony/sitemesh/webapp/decorator/NoDecorator.java
M src/test/com/opensymphony/module/sitemesh/parser/HTMLPageParserTest.java

Log Message:
-----------
Do not set the response content-length in the NoDecorator, as it is impossible to know the content-length in bytes when we don't know the encoding (sitemesh 2.4 used to assume UTF-8, but setting the content-length is not a significant advantage anyway).

Therefore, remove all references to content-length as it is only used by NoDecorator.

(Fixes bug JRADEV-6607)


Commit: 98e25a26fa20cb92f73c73504332a24eac04182c
https://github.com/sitemesh/sitemesh2/commit/98e25a26fa20cb92f73c73504332a24eac04182c
Author: Matt Quail <sp...@madbean.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)

Changed paths:
M src/java/com/opensymphony/module/sitemesh/parser/AbstractPage.java
M src/java/com/opensymphony/module/sitemesh/parser/PartialPageParserHtmlPage.java
M src/java/com/opensymphony/sitemesh/compatability/Content2HTMLPage.java
M src/java/com/opensymphony/sitemesh/webapp/decorator/BaseWebAppDecorator.java

Log Message:
-----------
Pass in the caused-by exception when chaining exceptions, to help with debugging


Commit: 4e416c28a6949c2caa0bac6e5659b53f25b6e910
https://github.com/sitemesh/sitemesh2/commit/4e416c28a6949c2caa0bac6e5659b53f25b6e910
Author: Matt Quail <sp...@madbean.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)

Changed paths:
M build.properties
M pom.xml

Log Message:
-----------
prepare for release of 2.4-atlassian-4


Commit: bf361ec1a0c93d103cb822acbbdb7efc5243f681
https://github.com/sitemesh/sitemesh2/commit/bf361ec1a0c93d103cb822acbbdb7efc5243f681
Author: Charles Miller <cha...@atlassian.com>
Date: 2011-08-10 (Wed, 10 Aug 2011)

Changed paths:
M src/java/com/opensymphony/module/sitemesh/html/BlockExtractingRule.java
A src/parser-tests/test45.txt

Log Message:
-----------
Prevent ArrayIndexOutOfBoundsException when the BlockExtractingRule encounters two closing tags in a row.


Commit: 70d849992ed4f261ffcdabb93845182ddfa74e3d
https://github.com/sitemesh/sitemesh2/commit/70d849992ed4f261ffcdabb93845182ddfa74e3d
Author: Charles Miller <cha...@atlassian.com>
Date: 2011-08-10 (Wed, 10 Aug 2011)

Changed paths:
M build.properties
M pom.xml

Log Message:
-----------
Prepare release of 2.5-atlassian-5


Commit: cf2be9084ecce7550d959f83063ac736dfc3fb9d
https://github.com/sitemesh/sitemesh2/commit/cf2be9084ecce7550d959f83063ac736dfc3fb9d
Author: Joe Walnes <jwa...@drwholdings.com>
Date: 2011-08-14 (Sun, 14 Aug 2011)

Changed paths:
M .gitignore
M CHANGES.txt
M build.properties
M build.xml
A pom.xml
A src/java/com/opensymphony/module/sitemesh/DefaultSitemeshBuffer.java
M src/java/com/opensymphony/module/sitemesh/Page.java
M src/java/com/opensymphony/module/sitemesh/PageParser.java
A src/java/com/opensymphony/module/sitemesh/SitemeshBuffer.java
A src/java/com/opensymphony/module/sitemesh/SitemeshBufferFragment.java
A src/java/com/opensymphony/module/sitemesh/SitemeshBufferWriter.java
A src/java/com/opensymphony/module/sitemesh/SitemeshWriter.java
M src/java/com/opensymphony/module/sitemesh/filter/Buffer.java
R src/java/com/opensymphony/module/sitemesh/filter/BufferedContent.java
M src/java/com/opensymphony/module/sitemesh/filter/PageResponseWrapper.java
M src/java/com/opensymphony/module/sitemesh/filter/RoutablePrintWriter.java
A src/java/com/opensymphony/module/sitemesh/filter/SitemeshPrintWriter.java
M src/java/com/opensymphony/module/sitemesh/html/BasicRule.java
M src/java/com/opensymphony/module/sitemesh/html/BlockExtractingRule.java
M src/java/com/opensymphony/module/sitemesh/html/CustomTag.java
M src/java/com/opensymphony/module/sitemesh/html/HTMLProcessor.java
M src/java/com/opensymphony/module/sitemesh/html/HTMLProcessorContext.java
M src/java/com/opensymphony/module/sitemesh/html/State.java
M src/java/com/opensymphony/module/sitemesh/html/StateTransitionRule.java
M src/java/com/opensymphony/module/sitemesh/html/Tag.java
M src/java/com/opensymphony/module/sitemesh/html/Text.java
M src/java/com/opensymphony/module/sitemesh/html/rules/BodyTagRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/ContentBlockExtractingRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/FramesetRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/HeadExtractingRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/HtmlAttributesRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/MSOfficeDocumentPropertiesRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/MetaTagRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/ParameterExtractingRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/TagReplaceRule.java
M src/java/com/opensymphony/module/sitemesh/html/rules/TitleExtractingRule.java
M src/java/com/opensymphony/module/sitemesh/html/tokenizer/Parser.java
M src/java/com/opensymphony/module/sitemesh/html/tokenizer/TagTokenizer.java
A src/java/com/opensymphony/module/sitemesh/html/util/StringSitemeshBuffer.java
M src/java/com/opensymphony/module/sitemesh/multipass/DivExtractingPageParser.java
M src/java/com/opensymphony/module/sitemesh/multipass/MultipassReplacementPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/AbstractHTMLPage.java
M src/java/com/opensymphony/module/sitemesh/parser/AbstractPage.java
M src/java/com/opensymphony/module/sitemesh/parser/FastPage.java
M src/java/com/opensymphony/module/sitemesh/parser/FastPageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/HTMLPageParser.java
A src/java/com/opensymphony/module/sitemesh/parser/PartialPageParser.java
A src/java/com/opensymphony/module/sitemesh/parser/PartialPageParserHtmlPage.java
A src/java/com/opensymphony/module/sitemesh/parser/PartialPageParserPage.java
R src/java/com/opensymphony/module/sitemesh/parser/SuperFastHtmlPage.java
R src/java/com/opensymphony/module/sitemesh/parser/SuperFastPage.java
M src/java/com/opensymphony/module/sitemesh/parser/SuperFastSimplePageParser.java
M src/java/com/opensymphony/module/sitemesh/parser/TokenizedHTMLPage.java
M src/java/com/opensymphony/module/sitemesh/taglib/page/ApplyDecoratorTag.java
M src/java/com/opensymphony/sitemesh/Content.java
M src/java/com/opensymphony/sitemesh/ContentProcessor.java
M src/java/com/opensymphony/sitemesh/compatability/Content2HTMLPage.java
M src/java/com/opensymphony/sitemesh/compatability/HTMLPage2Content.java
M src/java/com/opensymphony/sitemesh/compatability/PageParser2ContentProcessor.java
M src/java/com/opensymphony/sitemesh/webapp/ContentBufferingResponse.java
M src/java/com/opensymphony/sitemesh/webapp/decorator/NoDecorator.java
M src/parser-tests/parsers.properties
M src/parser-tests/superfast/test01.txt
M src/parser-tests/superfast/test02.txt
M src/parser-tests/superfast/test03.txt
M src/parser-tests/superfast/test04.txt
M src/parser-tests/superfast/test05.txt
A src/parser-tests/superfast/test06.txt
A src/parser-tests/superfast/test07.txt
M src/parser-tests/test10.txt
A src/parser-tests/test45.txt
A src/test/com/opensymphony/module/sitemesh/chaining/ChainingBufferTest.java
M src/test/com/opensymphony/module/sitemesh/html/HTMLProcessorTest.java
M src/test/com/opensymphony/module/sitemesh/html/rules/RegexReplacementTextFilterTest.java
M src/test/com/opensymphony/module/sitemesh/multipass/DivExtractingPageParserTest.java
M src/test/com/opensymphony/module/sitemesh/parser/HTMLPageParserTest.java
M src/test/com/opensymphony/module/sitemesh/parser/ParserPerformanceComparison.java

Log Message:
-----------
Merge branch 'master' of https://github.com/atlassian/sitemesh2 into atlassian

Conflicts:
src/java/com/opensymphony/sitemesh/webapp/decorator/BaseWebAppDecorator.java


Commit: e3952f50c8a9cf16f794532fbeab20a1d9a1f54b
https://github.com/sitemesh/sitemesh2/commit/e3952f50c8a9cf16f794532fbeab20a1d9a1f54b
Author: Joe Walnes <jwa...@drwholdings.com>
Date: 2011-08-14 (Sun, 14 Aug 2011)

Changed paths:
M build.properties
R pom.xml

Log Message:
-----------
Deatlassian-fied build


Commit: b0d9cddc27d54f42e9016af3ae8289db58c78dbf
https://github.com/sitemesh/sitemesh2/commit/b0d9cddc27d54f42e9016af3ae8289db58c78dbf
Author: Joe Walnes <jwa...@drwholdings.com>
Date: 2011-08-14 (Sun, 14 Aug 2011)

Changed paths:
M README.txt

Log Message:
-----------
bumped version


Compare: https://github.com/sitemesh/sitemesh2/compare/e6f60f0...b0d9cdd

Reply all
Reply to author
Forward
0 new messages