joerg 2004/04/21 15:03:53
Modified: lib jars.xml src/blocks/xsp/conf xsp-program-language.xconf . gump.xml Removed: src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java JstyleFormatter.java src/blocks/xsp/lib jstyle.jar Log: removed the buggy JStyle (used for code formatting of XSP a long time ago) Revision Changes Path 1.209 +1 -12 cocoon-2.1/lib/jars.xml Index: jars.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- jars.xml 17 Apr 2004 06:13:06 -0000 1.208 +++ jars.xml 21 Apr 2004 22:03:53 -0000 1.209 @@ -561,17 +561,6 @@ </file> <file> - <title>Java Formatter</title> - <description> - This program formats Java code with consistent indentation and so - forth, to make it easier to read and maintain. - </description> - <used-by>Cocoon</used-by> - <lib>xsp/lib/jstyle.jar</lib> - <homepage>http://astyle.sourceforge.net/</homepage> - </file> - - <file> <title>Transform HTML to XML</title> <description>Tidy is a HTML syntax checker and pretty printer.</description> <used-by>HTML generator (html block), RSSTransformer (Portal block)</used-by> 1.3 +5 -5 cocoon-2.1/src/blocks/xsp/conf/xsp-program-language.xconf Index: xsp-program-language.xconf =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/xsp/conf/xsp-program-language.xconf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsp-program-language.xconf 17 Mar 2004 11:28:21 -0000 1.2 +++ xsp-program-language.xconf 21 Apr 2004 22:03:53 -0000 1.3 @@ -21,11 +21,11 @@ <programming-languages> <java-language name="java" logger="core.language.java"> - <!-- Specifies which formatter to use to format source code. - This parameter is optional. - It is commented out because of bug #5689: Java "code-formatter" - incorrectly formats double values --> - <!--parameter name="code-formatter" value="org.apache.cocoon.components.language.programming.java.JstyleFormatter"/--> + <!--+ Specifies which formatter to use to format source code. + | This parameter is optional. + | At the moment there is no implementation of a code formatter available. + +--> + <!--parameter name="code-formatter" value="org.apache.cocoon.components.language.programming.java.NullFormatter"/--> <!-- A singleton-like implementation of a ClassLoader --> <parameter name="class-loader" value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/> 1.147 +1 -12 cocoon-2.1/gump.xml Index: gump.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- gump.xml 21 Apr 2004 09:33:22 -0000 1.146 +++ gump.xml 21 Apr 2004 22:03:53 -0000 1.147 @@ -78,7 +78,6 @@ <depend project="rhino-cocoondev"/> <depend project="jisp"/> <depend project="jing"/> - <depend project="jstyle"/> <depend project="pizza"/> <depend project="junit"/> <depend project="eclipse-jtd"/> @@ -1167,16 +1166,6 @@ </description> <home nested="lib/optional"/> <jar name="pizza-1.1.jar"/> - </project> - - <project name="jstyle"> - <url href="http://astyle.sourceforge.net/"/> - <package>jstyle</package> - <description> - Automatic Indentation Filter - </description> - <home nested="src/blocks/xsp/lib"/> - <jar name="jstyle.jar"/> </project> <project name="deli">