Author: sanka Date: Mon Sep 11 11:42:36 2006 New Revision: 442284 URL: http://svn.apache.org/viewvc?view=rev&rev=442284 Log: final preparation for the bsf-2.4-rc1
Added: jakarta/bsf/trunk/AUTHORS.txt - copied unchanged from r439627, jakarta/bsf/trunk/AUTHORS jakarta/bsf/trunk/BUILDING.txt - copied unchanged from r439627, jakarta/bsf/trunk/BUILDING jakarta/bsf/trunk/CHANGES.txt - copied unchanged from r439627, jakarta/bsf/trunk/CHANGES jakarta/bsf/trunk/INSTALL.txt - copied unchanged from r439627, jakarta/bsf/trunk/INSTALL jakarta/bsf/trunk/LICENSE.txt - copied unchanged from r439627, jakarta/bsf/trunk/LICENSE jakarta/bsf/trunk/NOTICE.txt - copied unchanged from r439632, jakarta/bsf/trunk/NOTICE jakarta/bsf/trunk/README.txt - copied unchanged from r439627, jakarta/bsf/trunk/README jakarta/bsf/trunk/RELEASE-NOTE.txt jakarta/bsf/trunk/TODO.txt - copied unchanged from r439627, jakarta/bsf/trunk/TODO jakarta/bsf/trunk/lib/junit-3.8.2.jar (with props) Removed: jakarta/bsf/trunk/AUTHORS jakarta/bsf/trunk/BUILDING jakarta/bsf/trunk/CHANGES jakarta/bsf/trunk/INSTALL jakarta/bsf/trunk/LICENSE jakarta/bsf/trunk/NOTICE jakarta/bsf/trunk/README jakarta/bsf/trunk/TODO Modified: jakarta/bsf/trunk/build-properties.xml jakarta/bsf/trunk/build.xml jakarta/bsf/trunk/src/org/apache/bsf/BSFException.java Added: jakarta/bsf/trunk/RELEASE-NOTE.txt URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/RELEASE-NOTE.txt?view=auto&rev=442284 ============================================================================== --- jakarta/bsf/trunk/RELEASE-NOTE.txt (added) +++ jakarta/bsf/trunk/RELEASE-NOTE.txt Mon Sep 11 11:42:36 2006 @@ -0,0 +1,101 @@ +<-- + +Copyright 2006 The Apache Software Foundation. + +Licensed 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. + +--> + + +========================= +BSF 2.4, RC 1, 2006-09-09 +========================= + +========================================================= +Release notes for BSF 2.4 (http://jakarta.apache.org/bsf) +========================================================= + + +About the "Bean Scripting Framework (BSF)" +========================================== + +BSF allows Java programmers to easily deploy scripts written in many scripting +(like) languages like JavaScript, JLog (PROLOG) Jython, Rexx, and use even XSLT +with the same simple, but powerful BSF APIs. + +It is possible to supply arguments and retrieve result values from the scripts, +as well as sharing Java objects among each other (and among all scripts that are +deployed with the help of the same BSF manager). + +BSF itself can be deployed starting with Java version 1.3, but some scripting +languages may need newer versions of Java. + +This release is meant to be fully compatible with any previous version of BSF. + + +Changes to previous release candidate +===================================== + +- Bug fixes, e.g. + + - datatype conversion now encompasses the oversighted primitive datatype + "char" into account (class 'TypeConvertor.java', + 'TypeConvertorRegistry.java') + + - dynamic event adapter creation now succeeds + + - fixed a few spelling errors in the code + +- Enhancements, changes, e.g. + + - can be used as an extension package to Java by placing it into + "jre/lib/ext" [using the thread's context classloader, ie. the result + of 'Thread.currentThread().getContextClassLoader()'] + + - removed experimental 'DebugLog' class, superceded by commons-logging + and log4j + + - removed 'org.apache.bsf.engines.activescript.*', as it is not + supported anymore (stems from the original IBM codebase, but would + need native Windows code to bridge OLE/ActiveX) + + - removed 'org.apache.bsf.engines.jpython', as it is superceded by + the newer 'org.apache.bsf.engines.jython' + + - 'org.apache.bsf.BSFMain.java': new method + "public String getVersion()", returns string in the form + 'abb.yyyymmdd', where 'a' is major number, 'bb' minor number, + 'yyyy' four digit year, 'mm' two digit month, 'dd' two digit day; + e.g. '240.20060909' stands for: BSF version 2.4 as of 2006-09-09 + + - new class 'org.apache.bsf.utils.BSFEventProcessorReturningEventInfos' + + - 'org.apache.bsf.utils.EngineUtils.java': added the method + 'addEventListenerReturningEventInfos(...)' + + +People who have contributed to this release one way or the other +(order by first name) +================================================================ + + Don Schwarz + Henning P. Schmiedehausen + Igor Bukanov + Kev Jackson + Nandika Jayawardana + Nilupa Bandara + Rony G. Flatscher + Sanjiva Weerawarana + Sanka Samaranayke + Thomas Klaeger (Kläger) + Victor J. Orlikowski \ No newline at end of file Modified: jakarta/bsf/trunk/build-properties.xml URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/build-properties.xml?view=diff&rev=442284&r1=442283&r2=442284 ============================================================================== --- jakarta/bsf/trunk/build-properties.xml (original) +++ jakarta/bsf/trunk/build-properties.xml Mon Sep 11 11:42:36 2006 @@ -3,7 +3,7 @@ <property name="project.name" value="bsf"/> <property name="project.fullName" value="Bean Scripting Framework"/> <property name="project.version" value="2.3.0"/> - <property name="project.debug" value="off"/> + <property name="project.debug" value="on"/> <property name="project.deprecation" value="on"/> Modified: jakarta/bsf/trunk/build.xml URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/build.xml?view=diff&rev=442284&r1=442283&r2=442284 ============================================================================== --- jakarta/bsf/trunk/build.xml (original) +++ jakarta/bsf/trunk/build.xml Mon Sep 11 11:42:36 2006 @@ -1,6 +1,24 @@ <?xml version="1.0"?> -<!-- =================================================================== +<!-- + + Copyright 2004,2004 The Apache Software Foundation. + + Licensed 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. + + + + =================================================================== Master Build file for BSF @@ -54,7 +72,7 @@ ==================================================================== --> <project name="BSF Build" default="compile" basedir="."> - + <import file="build-properties.xml" /> <!-- =================================================================== --> @@ -62,11 +80,8 @@ <!-- =================================================================== --> <patternset id="java.source.files"> <!-- Optionally includes engines based on dependencies being present --> - - <include name="**/bsf/*.java" /> <include name="**/util/**/*.java" /> - <include name="**/jacl/**" if="jacl.present" /> <include name="**/javascript/**" if="rhino.present" /> <include name="**/jython/**" if="jython.present" /> @@ -82,6 +97,11 @@ <pathelement location="${build.dest}" /> </path> + <path id="test.classpath"> + <path refid="compile.classpath"/> + <pathelement location="${build.tests}"/> + </path> + <target name="init" depends="clean"> <tstamp /> @@ -103,27 +123,27 @@ <!-- Determines what optional components are available --> <!-- ================================================================= --> <available property="jacl.present" classname="tcl.lang.JACL" /> - + <available property="jython.present" classname="org.python.util.jython" /> - + <available property="netrexx.present" classname="netrexx.lang.Rexx" /> - + <available property="rhino.present" classname="org.mozilla.javascript.Scriptable" /> - + <available property="xalan.present" classname="org.apache.xalan.xslt.EnvironmentCheck" /> - + <available property="junit.present" classname="junit.framework.TestCase" /> - + <uptodate property="javac.notRequired" targetfile="${build.lib}/${project.name}.jar"> <srcfiles dir="${src.dir}"> <patternset refid="javac.source.files" /> </srcfiles> </uptodate> - + <uptodate property="javadoc.required" targetfile="${build.lib}/${project.name}.jar"> <srcfiles dir="${build.dir}" includes="**/*.html" /> </uptodate> - + <antcall target="checkDependencies" /> </target> @@ -136,11 +156,11 @@ <include name="*.jar" /> </fileset> </path> - + <available property="AnakiaTask.present" classname="org.apache.velocity.anakia.AnakiaTask"> <classpath refid="anakia.classpath" /> </available> - + <antcall target="checkAnakiaTask" /> </target> @@ -173,13 +193,13 @@ <target name="checkJUnit" unless="junit.present"> <echo message="Warning: JUnit dependencies were not resolved." /> </target> - + <target name="checkDependencies" unless="javac.notRequired"> <antcall target="checkJacl" /> <antcall target="checkJython" /> <antcall target="checkNetRexx" /> <antcall target="checkRhino" /> - + <antcall target="checkXalan" /> <antcall target="checkJUnit" /> </target> @@ -210,10 +230,19 @@ <target name="jar" depends="compile" description="Produces the jar file and copies to ${build.lib}"> <mkdir dir="${build.lib}" /> <copy todir="${build.dest}"> - <fileset dir="${src.dir}"> - <include name="**/*.properties" /> - </fileset> - </copy> + <fileset dir="${src.dir}"> + <include name="**/*.properties" /> + </fileset> + </copy> + + <mkdir dir="${build.dest}/META-INF" /> + <copy todir="${build.dest}/META-INF"> + <fileset dir="${basedir}"> + <include name="**/LICENSE.txt" /> + <include name="**/NOTICE.txt" /> + </fileset> + </copy> + <jar jarfile="${build.lib}/${project.name}.jar" basedir="${build.dest}" /> <uptodate property="javadoc.required" targetfile="${build.lib}/${project.name}.jar"> <srcfiles dir="${build.dir}" includes="**/*.html" /> @@ -236,14 +265,16 @@ <!-- =================================================================== --> <!-- Creates the API documentation --> <!-- =================================================================== --> - <target name="javadocs" description="Generates the API documentation." depends="compile" > + <target name="javadocs" description="Generates the API documentation." depends="compile"> <mkdir dir="${build.javadocs}" /> <!-- FIXME: Excluding some packages temporarily --> <javadoc packagenames="${packages}" failonerror="true" excludepackagenames="org.apache.bsf.engines.java, org.apache.bsf.engines.javaclass" destdir="${build.javadocs}" author="true" version="false" use="true" windowtitle="${project.fullName} API" doctitle="${project.fullName}"> - <classpath><fileset dir="lib"><include name="*.jar"/></fileset></classpath> - <fileset dir="${src.dir}"><patternset refid="java.source.files"></patternset></fileset> + <classpath refid="compile.classpath" /> + <fileset dir="${src.dir}"> + <patternset refid="java.source.files"></patternset> + </fileset> </javadoc> - + </target> <!-- =================================================================== --> @@ -253,13 +284,13 @@ <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"> <classpath refid="anakia.classpath" /> </taskdef> - + <anakia basedir="${site.src}" destdir="${site.dest}/" extension=".html" style="./site.vsl" projectFile="${site.projectFile}" excludes="**/stylesheets/** faq.xml" includes="**/*.xml" lastModifiedCheck="true" templatePath="${templ.path}" velocityPropertiesFile="${velocity.props}"/> - + <anakia basedir="${site.src}" destdir="${site.dest}/" extension=".html" style="./faq.vsl" projectFile="${site.projectFile}" includes="faq.xml" lastModifiedCheck="true" templatePath="${templ.path}" velocityPropertiesFile="${velocity.props}"/> - + <copy todir="${site.dest}/images" filtering="no"> <fileset dir="${site.src}/images"> <include name="**/*.gif" /> @@ -273,7 +304,7 @@ <!-- Creates the binary distribution --> <!-- =================================================================== --> <target name="bindist" description="Creates the binary distribution(s)." depends="javadocs, samples"> - + <copy todir="${dist.dir.root}/docs/api"> <fileset dir="${build.javadocs}" /> </copy> @@ -283,13 +314,14 @@ <copy todir="${dist.dir.root}/samples"> <fileset dir="${build.samples}" /> </copy> - - <copy file="AUTHORS" tofile="${dist.dir.root}/AUTHORS" /> - <copy file="README" tofile="${dist.dir.root}/README" /> - <copy file="INSTALL" tofile="${dist.dir.root}/INSTALL" /> - <copy file="CHANGES" tofile="${dist.dir.root}/CHANGES" /> - <copy file="TODO" tofile="${dist.dir.root}/TODO" /> - <copy file="LICENSE" tofile="${dist.dir.root}/LICENSE" /> + + <copy file="AUTHORS.txt" tofile="${dist.dir.root}/AUTHORS.txt" /> + <copy file="README.txt" tofile="${dist.dir.root}/README.txt" /> + <copy file="INSTALL.txt" tofile="${dist.dir.root}/INSTALL.txt" /> + <copy file="CHANGES.txt" tofile="${dist.dir.root}/CHANGES.txt" /> + <copy file="TODO.txt" tofile="${dist.dir.root}/TODO.txt" /> + <copy file="LICENSE.txt" tofile="${dist.dir.root}/LICENSE.txt" /> + <copy file="RELEASE-NOTE.txt" tofile="${dist.dir.root}/RELEASE-NOTE.txt" /> <!-- ================================================================= --> <!-- Produces the tar/gzip file --> @@ -308,18 +340,19 @@ <!-- Creates the source distribution --> <!-- =================================================================== --> <target name="srcdist" description="Creates the source distribution(s)." depends="init"> - + <copy todir="${dist.dir.root}/src"> <fileset dir="${src.dir}" /> </copy> - - <copy file="BUILDING" tofile="${dist.dir.root}/BUILDING" /> - <copy file="INSTALL" tofile="${dist.dir.root}/INSTALL" /> - <copy file="README" tofile="${dist.dir.root}/README" /> - <copy file="CHANGES" tofile="${dist.dir.root}/CHANGES" /> - <copy file="TODO" tofile="${dist.dir.root}/TODO" /> - <copy file="AUTHORS" tofile="${dist.dir.root}/AUTHORS" /> - <copy file="LICENSE" tofile="${dist.dir.root}/LICENSE" /> + + <copy file="BUILDING.txt" tofile="${dist.dir.root}/BUILDING.txt" /> + <copy file="INSTALL.txt" tofile="${dist.dir.root}/INSTALL.txt" /> + <copy file="README.txt" tofile="${dist.dir.root}/README.txt" /> + <copy file="CHANGES.txt" tofile="${dist.dir.root}/CHANGES.txt" /> + <copy file="TODO.txt" tofile="${dist.dir.root}/TODO.txt" /> + <copy file="AUTHORS.txt" tofile="${dist.dir.root}/AUTHORS.txt" /> + <copy file="LICENSE.txt" tofile="${dist.dir.root}/LICENSE.txt" /> + <copy file="RELEASE.txt" tofile="${dist.dir.root}/RELEASE.txt" /> <copy file="${build.file}" tofile="${dist.dir.root}/${build.file}" /> <!-- ================================================================= --> @@ -341,18 +374,20 @@ <!-- =================================================================== --> <target name="compile-test" if="junit.present" depends="compile"> <mkdir dir="${build.tests}" /> - <javac srcdir="${tests.dir}" destdir="${build.tests}" classpath="${build.lib}/${project.name}.jar" /> + <javac srcdir="${tests.dir}" destdir="${build.tests}" classpath="${build.dest}" /> </target> <!-- =================================================================== --> <!-- Performs unit tests --> <!-- =================================================================== --> <target name="test" if="junit.present" description="Performs unit tests on BSF." depends="compile-test"> + <copy todir="${build.dest}" overwrite="true"> + <fileset dir="${src.dir}"> + <include name="**/*.properties" /> + </fileset> + </copy> <junit> - <classpath> - <pathelement location="${build.lib}/${project.name}.jar" /> - <pathelement location="${build.tests}" /> - </classpath> + <classpath refid="test.classpath" /> <formatter type="brief" usefile="false" /> <test name="org.apache.bsf.BSFTest" /> </junit> @@ -370,6 +405,6 @@ <delete dir="${build.dir}" /> <delete dir="${dist.dir}" /> </target> - + <target name="all" depends="build-site, dist" /> </project> Added: jakarta/bsf/trunk/lib/junit-3.8.2.jar URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/lib/junit-3.8.2.jar?view=auto&rev=442284 ============================================================================== Binary file - no diff available. Propchange: jakarta/bsf/trunk/lib/junit-3.8.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: jakarta/bsf/trunk/src/org/apache/bsf/BSFException.java URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/src/org/apache/bsf/BSFException.java?view=diff&rev=442284&r1=442283&r2=442284 ============================================================================== --- jakarta/bsf/trunk/src/org/apache/bsf/BSFException.java (original) +++ jakarta/bsf/trunk/src/org/apache/bsf/BSFException.java Mon Sep 11 11:42:36 2006 @@ -26,12 +26,12 @@ * @author Sanjiva Weerawarana */ public class BSFException extends Exception { - public static int REASON_INVALID_ARGUMENT = 0; - public static int REASON_IO_ERROR = 10; - public static int REASON_UNKNOWN_LANGUAGE = 20; - public static int REASON_EXECUTION_ERROR = 100; - public static int REASON_UNSUPPORTED_FEATURE = 499; - public static int REASON_OTHER_ERROR = 500; + public static final int REASON_INVALID_ARGUMENT = 0; + public static final int REASON_IO_ERROR = 10; + public static final int REASON_UNKNOWN_LANGUAGE = 20; + public static final int REASON_EXECUTION_ERROR = 100; + public static final int REASON_UNSUPPORTED_FEATURE = 499; + public static final int REASON_OTHER_ERROR = 500; int reason; Throwable targetThrowable; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]