cvs commit: jakarta-jetspeed-2/cps/test/rewriter default-rewriter-rules.xml test-001-output.html test-001.html test-remove-rules.xml test-rewriter-rules.xml

[ta...@apache.org]

taylor      2003/10/01 22:30:28

  Modified:    cps      maven.xml project.xml
               cps/src/java/org/apache/jetspeed/cps/template
                        TemplateLocator.java
               cps/test/WEB-INF/conf cps.properties
  Added:       cps/src/java/org/apache/jetspeed/cps/rewriter
                        AbstractRewriter.java BasicRewriter.java
                        MutableAttributes.java ParserAdaptor.java
                        Rewriter.java RewriterException.java
                        RewriterService.java RewriterServiceImpl.java
                        RulesetRewriter.java RulesetRewriterImpl.java
               cps/src/java/org/apache/jetspeed/cps/rewriter/html
                        SwingAttributes.java SwingParserAdaptor.java
                        SwingParserAdaptor2.java
               cps/src/java/org/apache/jetspeed/cps/rewriter/rules
                        Attribute.java Identified.java Rule.java
                        Ruleset.java Tag.java
               cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl
                        AttributeImpl.java IdentifiedImpl.java
                        RuleImpl.java RulesetImpl.java TagImpl.java
               cps/src/java/org/apache/jetspeed/cps/rewriter/xml
                        SaxParserAdaptor.java
               cps/src/test/org/apache/jetspeed/cps/rewriter
                        TestRewriter.java TestRewriterRules.java
               cps/test/WEB-INF/conf rewriter-rules-mapping.xml
               cps/test/rewriter default-rewriter-rules.xml
                        test-001-output.html test-001.html
                        test-remove-rules.xml test-rewriter-rules.xml
  Log:
  Spent some time redesigning refactoring the rewriter utility from Jetspeed-1.
  Since Im going to use this in Jetspeed-1 (via the CPS bridge) and Jetspeed-2, thought it would be best to house it
  in Jetspeed-2 CPS repo.
  
  Summary:
  - all input and output is now stream (Reader/Writer) based, no longer using strings.
  - added more interfaces further distilling the concepts of Rewriter and ParserAdaptor
  - removed all dependencies on Swing Parser from interfaces.
    in fact it should be very easy now to plugin the better Neko HTML parser now.
  - New Rewriter service
  	- pluggable rewriter and adaptor via media type (XML, HTML supported)
  - more events, removed all ties to Swing in events
  - unit tests
  - xml rule-based configuration
    all logic regarding rewriting is removed from adaptors
    instead you should either
  	1. use an XML configuration file to define rewriting, stripping, and removal rules
  	2. write your own rewriting rules by extending the BasicRewriter and handling the events yourself
  	3. combine 1 and 2
  
  Anyway been promising this for a while, so hope this is an improvement.
  Its going to need a lot of tweaking still, but at least the design is in place now.
  Still haven't completed the conversion of WebPage Service :(
  Think that may have to go on the back burner until J2's aggregator is completed, which I will start on next week
  
  Revision  Changes    Path
  1.2       +1 -1      jakarta-jetspeed-2/cps/maven.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/maven.xml.diff?r1=1.1&r2=1.2
  
  
  1.2       +8 -0      jakarta-jetspeed-2/cps/project.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/project.xml.diff?r1=1.1&r2=1.2
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/AbstractRewriter.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/AbstractRewriter.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/BasicRewriter.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/BasicRewriter.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/MutableAttributes.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/MutableAttributes.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/ParserAdaptor.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/ParserAdaptor.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/Rewriter.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/Rewriter.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/RewriterException.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/RewriterException.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/RewriterService.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/RewriterService.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/RewriterServiceImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/RewriterServiceImpl.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/RulesetRewriter.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/RulesetRewriter.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/RulesetRewriterImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/RulesetRewriterImpl.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/html/SwingAttributes.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/html/SwingAttributes.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/html/SwingParserAdaptor.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/html/SwingParserAdaptor.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/html/SwingParserAdaptor2.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/html/SwingParserAdaptor2.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/Attribute.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/Attribute.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/Identified.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/Identified.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/Rule.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/Rule.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/Ruleset.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/Ruleset.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/Tag.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/Tag.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl/AttributeImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl/AttributeImpl.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl/IdentifiedImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl/IdentifiedImpl.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl/RuleImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl/RuleImpl.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl/RulesetImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl/RulesetImpl.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl/TagImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/rules/impl/TagImpl.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/xml/SaxParserAdaptor.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/rewriter/xml/SaxParserAdaptor.java?rev=1.1
  
  
  1.3       +3 -4      jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/template/TemplateLocator.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/template/TemplateLocator.java.diff?r1=1.2&r2=1.3
  
  
  1.1                  jakarta-jetspeed-2/cps/src/test/org/apache/jetspeed/cps/rewriter/TestRewriter.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/test/org/apache/jetspeed/cps/rewriter/TestRewriter.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/src/test/org/apache/jetspeed/cps/rewriter/TestRewriterRules.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/src/test/org/apache/jetspeed/cps/rewriter/TestRewriterRules.java?rev=1.1
  
  
  1.2       +8 -0      jakarta-jetspeed-2/cps/test/WEB-INF/conf/cps.properties
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/test/WEB-INF/conf/cps.properties.diff?r1=1.1&r2=1.2
  
  
  1.1                  jakarta-jetspeed-2/cps/test/WEB-INF/conf/rewriter-rules-mapping.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/test/WEB-INF/conf/rewriter-rules-mapping.xml?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/test/rewriter/default-rewriter-rules.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/test/rewriter/default-rewriter-rules.xml?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/test/rewriter/test-001-output.html
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/test/rewriter/test-001-output.html?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/test/rewriter/test-001.html
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/test/rewriter/test-001.html?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/test/rewriter/test-remove-rules.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/test/rewriter/test-remove-rules.xml?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/cps/test/rewriter/test-rewriter-rules.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/cps/test/rewriter/test-rewriter-rules.xml?rev=1.1
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org