svn commit: r156613 - in cocoon/trunk: gump.xml legal/pizza-1.1.jar.license.txt lib/optional/pizza-1.1.jar src/blocks/xsp/conf/xsp-program-language.xconf src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/Pizza.java status.xml

[an...@apache.org]

Author: antonio
Date: Tue Mar  8 20:36:17 2005
New Revision: 156613

URL: http://svn.apache.org/viewcvs?view=rev&rev=156613
Log:
Remove pizza compiler support.

Removed:
    cocoon/trunk/legal/pizza-1.1.jar.license.txt
    cocoon/trunk/lib/optional/pizza-1.1.jar
    cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/Pizza.java
Modified:
    cocoon/trunk/gump.xml
    cocoon/trunk/src/blocks/xsp/conf/xsp-program-language.xconf
    cocoon/trunk/status.xml

Modified: cocoon/trunk/gump.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?view=diff&r1=156612&r2=156613
==============================================================================
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Tue Mar  8 20:36:17 2005
@@ -1160,10 +1160,8 @@
     <depend project="cocoon-block-session-fw"/>
     <depend project="cocoon-block-databases"/>
     <depend project="concurrent"/>
-    <depend project="pizza"/>
     <depend project="jdtcore"/>
 
-    <library name="pizza"/>
     <library name="jdtcore"/>
 
     <work nested="tools/anttasks"/>
@@ -1308,16 +1306,6 @@
     ********  COCOON SUPPLIED PROJECTS  ********
     ********************************************
   -->
-
-  <project name="pizza">
-    <url href="http://pizzacompiler.sourceforge.net/"/>
-    <package>net.sf.pizzacompiler</package>
-    <description>
-      Java Compiler
-    </description>
-    <home nested="lib/optional"/>
-    <jar name="pizza-1.1.jar"/>
-  </project>
 
   <project name="deli">
     <url href="http://sourceforge.net/projects/delicon/"/>

Modified: cocoon/trunk/src/blocks/xsp/conf/xsp-program-language.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/conf/xsp-program-language.xconf?view=diff&r1=156612&r2=156613
==============================================================================
--- cocoon/trunk/src/blocks/xsp/conf/xsp-program-language.xconf (original)
+++ cocoon/trunk/src/blocks/xsp/conf/xsp-program-language.xconf Tue Mar  8 20:36:17 2005
@@ -36,7 +36,6 @@
           |  - EclipseJavaCompiler: the Eclipse JTD java compiler
           |  - Javac: the java compiler that comes with JDK
           |  - Jikes: the Jikes java compiler
-          |  - Pizza: the Pizza java compiler
           |
           | NOTE: the Eclipse JTD is the only java compiler that is capable
           |       of imports classes thru the context classloader. All other
@@ -48,7 +47,6 @@
       <parameter name="compiler" value="org.apache.cocoon.components.language.programming.java.EclipseJavaCompiler"/>
       <!--parameter name="compiler" value="org.apache.cocoon.components.language.programming.java.Javac"/-->
       <!--parameter name="compiler" value="org.apache.cocoon.components.language.programming.java.Jikes"/-->
-      <!--parameter name="compiler" value="org.apache.cocoon.components.language.programming.java.Pizza"/-->
 
       <!--+
           | Specifies the java code source version used to compile the XSP code.
@@ -62,7 +60,6 @@
           | NOTE: The parameter is optional to keep backward compatibility.
           |       The parameter currently works only with Sun Javac compiler.
           |       The eclipse compiler version 3.0.1 currently does not support java 1.5.
-          |       The pizza compiler does not support java 1.5.
           +-->
       <!-- <parameter name="compiler-compliance-level" value="auto"/> -->
     </java-language>

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diff&r1=156612&r2=156613
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Tue Mar  8 20:36:17 2005
@@ -199,9 +199,11 @@
    </actions>
   </todo>
 
-
   <changes>
   <release version="@version@" date="@date@">
+   <action dev="AG" type="">
+     Removed deprecated Pizza compiler support in XSP.
+   </action>
    <action dev="SW" type="add">
      Each sitemap can now have its own classpath using <code>&lt;map:classpath&gt;</code>. This allows
      sitemap-specific components to be deployed locally with the sitemap. Reloading the sitemap
@@ -427,6 +429,9 @@
    </action>
  </release>
  <release version="2.1.7" date="TBD">
+   <action dev="AG" type="update">
+     Deprecated Pizza compiler support in XSP. To be removed in Cocoon 2.2.
+   </action>
    <action dev="VG" type="update">
      CForms: JavaSelectionList implementations can now be Contextualizable and
      can build SelectionLists with XMLizable labels.