--- misc/BeanShell/build.xml Fri Dec 19 17:14:27 2003 +++ misc/build/BeanShell/build.xml Fri Mar 28 15:55:04 2008 @@ -17,7 +17,7 @@ up the build dir! It has to be done manually the first time (or put in the jar file). There must be a way to fix this... --> -<project name="beanshell" default="compile" basedir="."> +<project name="beanshell" default="jarall" basedir="."> <!-- Project Configuration --> @@ -71,6 +71,9 @@ value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/> --> + <property name="exclude-bsf" + value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/> + <!-- Uncomment to build without the ASM class generator code. <property name="exclude-classgen" value="bsh/org/objectweb/asm/**,bsh/ClassGeneratorImpl.java,bsh/ClassGeneratorUtil.java,bsh/DelayedEvalBshMethod.java"/> @@ -80,6 +83,9 @@ <property name="exclude-servlet" value="bsh/servlet/*"/> --> + + <property name="exclude-servlet" + value="bsh/servlet/*"/> <!-- Legacy excludes. Comment this *out* to build these legacy items --> <property name="legacy-excludes" --- misc/BeanShell/makefile.mk Fri Mar 28 15:56:40 2008 +++ misc/build/BeanShell/makefile.mk Fri Mar 28 15:56:06 2008 @@ -1 +1,29 @@ -dummy +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + +PRJ=..$/..$/..$/.. +PRJNAME=ooo_beanshell +TARGET=jarall + +.INCLUDE : ant.mk + +ALLTAR : ANTBUILD + --- misc/BeanShell/src/bsh/ClassGeneratorUtil.java Fri Dec 19 17:14:28 2003 +++ misc/build/BeanShell/src/bsh/ClassGeneratorUtil.java Fri Mar 28 15:55:05 2008 @@ -34,7 +34,9 @@ package bsh; import bsh.org.objectweb.asm.*; -import java.lang.reflect.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List;