beanshell/bsh-2.0b1-src.patch

   1 --- misc/BeanShell/build.xml    Fri Dec 19 17:14:27 2003
   2 +++ misc/build/BeanShell/build.xml      Fri Mar 28 15:55:04 2008
   3 @@ -17,7 +17,7 @@
   4                 up the build dir!  It has to be done manually the first time (or put
   5                 in the jar file). There must be a way to fix this...
   6  -->
   7 -<project name="beanshell" default="compile" basedir=".">
   8 +<project name="beanshell" default="jarall" basedir=".">
   9
  10  <!-- Project Configuration -->
  11
  12 @@ -71,6 +71,9 @@
  13                 value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/>
  14         -->
  15
  16 +       <property name="exclude-bsf"
  17 +               value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/>
  18 +
  19         <!-- Uncomment to build without the ASM class generator code.
  20         <property name="exclude-classgen"
  21                 value="bsh/org/objectweb/asm/**,bsh/ClassGeneratorImpl.java,bsh/ClassGeneratorUtil.java,bsh/DelayedEvalBshMethod.java"/>
  22 @@ -80,6 +83,9 @@
  23         <property name="exclude-servlet"
  24                 value="bsh/servlet/*"/>
  25         -->
  26 +
  27 +       <property name="exclude-servlet"
  28 +               value="bsh/servlet/*"/>
  29
  30         <!-- Legacy excludes.  Comment this *out* to build these legacy items -->
  31         <property name="legacy-excludes"
  32 --- misc/BeanShell/makefile.mk  Fri Mar 28 15:56:40 2008
  33 +++ misc/build/BeanShell/makefile.mk    Fri Mar 28 15:56:06 2008
  34 @@ -1 +1,39 @@
  35 -dummy
  36 +#*************************************************************************
  37 +#
  38 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  39 +#
  40 +# Copyright 2008 by Sun Microsystems, Inc.
  41 +#
  42 +# OpenOffice.org - a multi-platform office productivity suite
  43 +#
  44 +# $RCSfile: bsh-2.0b1-src.patch,v $
  45 +#
  46 +# $Revision: 1.7 $
  47 +#
  48 +# This file is part of OpenOffice.org.
  49 +#
  50 +# OpenOffice.org is free software: you can redistribute it and/or modify
  51 +# it under the terms of the GNU Lesser General Public License version 3
  52 +# only, as published by the Free Software Foundation.
  53 +#
  54 +# OpenOffice.org is distributed in the hope that it will be useful,
  55 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
  56 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  57 +# GNU Lesser General Public License version 3 for more details
  58 +# (a copy is included in the LICENSE file that accompanied this code).
  59 +#
  60 +# You should have received a copy of the GNU Lesser General Public License
  61 +# version 3 along with OpenOffice.org.  If not, see
  62 +# <http://www.openoffice.org/license.html>
  63 +# for a copy of the LGPLv3 License.
  64 +#
  65 +#*************************************************************************
  66 +
  67 +PRJ=..$/..$/..$/..
  68 +PRJNAME=ooo_beanshell
  69 +TARGET=jarall
  70 +
  71 +.INCLUDE : ant.mk
  72 +
  73 +ALLTAR : ANTBUILD
  74 +
  75 --- misc/BeanShell/src/bsh/ClassGeneratorUtil.java      Fri Dec 19 17:14:28 2003
  76 +++ misc/build/BeanShell/src/bsh/ClassGeneratorUtil.java        Fri Mar 28 15:55:05 2008
  77 @@ -34,7 +34,9 @@
  78  package bsh;
  79
  80  import bsh.org.objectweb.asm.*;
  81 -import java.lang.reflect.*;
  82 +import java.lang.reflect.Constructor;
  83 +import java.lang.reflect.InvocationTargetException;
  84 +import java.lang.reflect.Method;
  85  import java.util.ArrayList;
  86  import java.util.List;
  87