Author: crossley
Date: Fri Aug 22 01:32:41 2008
New Revision: 688020
URL: http://svn.apache.org/viewvc?rev=688020&view=rev
Log:
Only formatting changes. Re-order the sections of the "XSP" to enable
comparison with Cocoon-2.1 xconf.
Modified:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
Modified:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=688020&r1=688019&r2=688020&view=diff
==============================================================================
---
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
(original)
+++
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
Fri Aug 22 01:32:41 2008
@@ -781,65 +781,7 @@
<!-- ================ XSP (eXtensible Server Pages) ===================== -->
<!--+
- | Program Generator
- |
- | The ProgamGenerator builds programs from a XML document written in a
- | MarkupLanguage.
- |
- | auto-reload: whether the system should check if the source was
- | modified and reload of consequence.
- | root-package: the java package to use for the generated classes
- | preload: whether the system should preload the necessary components
- +-->
- <program-generator logger="core.program-generator">
- <parameter name="auto-reload" value="true"/>
- <parameter name="root-package" value="org.apache.cocoon.www"/>
- <parameter name="preload" value="true"/>
- </program-generator>
-
- <!--+
- | Programming Languages for the XSP pages
- +-->
- <programming-languages>
- <java-language logger="core.language.java" name="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"/-->
-
- <!-- A singleton-like implementation of a ClassLoader -->
- <parameter name="class-loader"
value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
-
- <!--+
- | Specifies which Java compiler to use. Possible variants are:
- |
- | - Javac: the java compiler that comes with JDK
- | - Pizza: the Pizza java compiler
- | - Jikes: the Jikes java compiler
- | - EclipseJavaCompiler: the Eclipse JTD java compiler
- |
- | NOTE: the Eclipse JTD is the only java compiler that is capable
- | of imports classes thru the context classloader. All other
- | compilers import classes from the JVM classpath and might
- | normally result in ClassNotFound problems at compilation
- | time. It is *HIGHLY* suggested that you use this compiler
- | or you might experience problems in some servlet containers.
- +-->
- <!--parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Javac"/-->
- <!--parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Pizza"/-->
- <!--parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Jikes"/-->
- <parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.EclipseJavaCompiler"/>
-
- </java-language>
-
- <!-- Interpreted JavaScript language -->
- <js-language logger="core.language.js" name="js"/>
- </programming-languages>
-
- <!--+
- | Logisheets
+ | Logicsheets
|
| This section defines the XSP logicsheets. A logicsheet is a special
| XSLT stylesheet used to translate user-defined dynamic markup into
@@ -994,6 +936,64 @@
</xsp-language>
</markup-languages>
+ <!--+
+ | Program Generator
+ |
+ | The ProgamGenerator builds programs from a XML document written in a
+ | MarkupLanguage.
+ |
+ | auto-reload: whether the system should check if the source was
+ | modified and reload of consequence.
+ | root-package: the java package to use for the generated classes
+ | preload: whether the system should preload the necessary components
+ +-->
+ <program-generator logger="core.program-generator">
+ <parameter name="auto-reload" value="true"/>
+ <parameter name="root-package" value="org.apache.cocoon.www"/>
+ <parameter name="preload" value="true"/>
+ </program-generator>
+
+ <!--+
+ | Programming Languages for the XSP pages
+ +-->
+ <programming-languages>
+ <java-language logger="core.language.java" name="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"/-->
+
+ <!-- A singleton-like implementation of a ClassLoader -->
+ <parameter name="class-loader"
value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
+
+ <!--+
+ | Specifies which Java compiler to use. Possible variants are:
+ |
+ | - Javac: the java compiler that comes with JDK
+ | - Pizza: the Pizza java compiler
+ | - Jikes: the Jikes java compiler
+ | - EclipseJavaCompiler: the Eclipse JTD java compiler
+ |
+ | NOTE: the Eclipse JTD is the only java compiler that is capable
+ | of imports classes thru the context classloader. All other
+ | compilers import classes from the JVM classpath and might
+ | normally result in ClassNotFound problems at compilation
+ | time. It is *HIGHLY* suggested that you use this compiler
+ | or you might experience problems in some servlet containers.
+ +-->
+ <!--parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Javac"/-->
+ <!--parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Pizza"/-->
+ <!--parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Jikes"/-->
+ <parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.EclipseJavaCompiler"/>
+
+ </java-language>
+
+ <!-- Interpreted JavaScript language -->
+ <js-language logger="core.language.js" name="js"/>
+ </programming-languages>
+
<!-- Xscript -->
<xscript logger="core.xscript">
<parameter name="xscript:copy-of"
value="resource://org/apache/cocoon/components/xscript/xslt/copy-of.xsl"/>
