vgritsenko 02/03/09 20:54:31
Modified: . build.xml
src/webapp cocoon.xconf
Added: src/java/org/apache/cocoon/components/language/programming/java
javac.xconf pizza.xconf
Log:
Make Pizza default Java compiler. If you want to switch back to Javac, do:
1. rm lib/optional/pizza*
2. build clean
3. build
Revision Changes Path
1.182 +4 -2 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- build.xml 10 Mar 2002 03:09:17 -0000 1.181
+++ build.xml 10 Mar 2002 04:54:31 -0000 1.182
@@ -741,7 +741,9 @@
<exclude name="**/poi.x*" unless="poi.present"/>
<exclude name="**/POIFSSerializer.java" unless="poi.present"/>
- <exclude name="**/Pizza.java" unless="pizza.present"/>
+ <exclude name="**/java/Pizza.java" unless="pizza.present"/>
+ <exclude name="**/java/pizza.x*" unless="pizza.present"/>
+ <exclude name="**/java/javac.x*" if="pizza.present"/>
<exclude name="**/JSP*.java" unless="servlet.present"/>
<exclude name="**/Jsp*.java" unless="servlet.present"/>
@@ -1167,7 +1169,7 @@
<!-- =================================================================== -->
<!-- Copies the tools.jar to javac.jar in web-inf/lib -->
<!-- =================================================================== -->
- <target name="prepare-tools-lib" depends="package" if="tools.jar.present">
+ <target name="prepare-tools-lib" depends="package" if="tools.jar.present"
unless="pizza.present">
<!-- NOTE: java.home is normally set by the JVM to the /jre directory -->
<copy file="${tools.jar}" tofile="${build.war}/WEB-INF/lib/javac.jar"/>
</target>
1.1
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/javac.xconf
Index: javac.xconf
===================================================================
<?xml version="1.0"?>
<xconf xpath="cocoon/programming-languages/java-language"
unless="parameter[@name='compiler']">
<!-- Compiler parameter specifies which class to use to compile Java.
Possible variants are:
Javac. Requires javac.jar (included with JDK as lib/toools.jar).
Pizza. Requires pizza.jar (included with Cocoon distribution).
Jikes. Requires IBM jikes compiler to be present in the PATH -->
<parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Javac"/>
</xconf>
1.1
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/pizza.xconf
Index: pizza.xconf
===================================================================
<?xml version="1.0"?>
<xconf xpath="cocoon/programming-languages/java-language"
unless="parameter[@name='compiler']">
<!-- Compiler parameter specifies which class to use to compile Java.
Possible variants are:
Javac. Requires javac.jar (included with JDK as lib/toools.jar).
Pizza. Requires pizza.jar (included with Cocoon distribution).
Jikes. Requires IBM jikes compiler to be present in the PATH -->
<parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Pizza"/>
</xconf>
1.38 +0 -6 xml-cocoon2/src/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/cocoon.xconf,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cocoon.xconf 10 Mar 2002 03:09:17 -0000 1.37
+++ cocoon.xconf 10 Mar 2002 04:54:31 -0000 1.38
@@ -209,12 +209,6 @@
<!-- Programming Languages: -->
<programming-languages>
<java-language name="java" logger="core.language.java">
- <!-- Compiler parameter specifies which class to use to compile Java.
- Possible variants are:
- Javac. Requires javac.jar (included with Cocoon distribution).
- Pizza. Requires pizza.jar (included with Cocoon distribution).
- Jikes. Requires IBM jikes compiler to be present in the PATH -->
- <parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Javac"/>
<!-- 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
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
