orlikowski 2004/06/14 12:19:32
Modified: . build.xml
src/org/apache/bsf BSFManager.java
src/org/apache/bsf/engines/netrexx NetRexxEngine.java
src/org/apache/bsf/util ReflectionUtils.java
Log:
Complete the JPython removal, and fixup javadoc generation.
Revision Changes Path
1.10 +3 -15 jakarta-bsf/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-bsf/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 14 Jun 2004 17:29:39 -0000 1.9
+++ build.xml 14 Jun 2004 19:19:32 -0000 1.10
@@ -8,10 +8,6 @@
This is the build file for use with the Jakarta Ant build tool.
-Prerequisites:
-
- servlet/JSP API -> http
-
Optional additions:
Rhino -> http://www.mozilla.org/rhino/
@@ -118,15 +114,6 @@
<available property="jacl.present"
classname="tcl.lang.JACL"/>
- <condition property="jpython.present">
- <and>
- <available classname="org.python.util.PythonInterpreter"/>
- <not>
- <available classname="org.python.util.jython"/>
- </not>
- </and>
- </condition>
-
<available property="jython.present"
classname="org.python.util.jython"/>
@@ -226,7 +213,6 @@
<exclude name="**/activescript/**"/>
<exclude name="**/jacl/**" unless="jacl.present"/>
<exclude name="**/javascript/**" unless="rhino.present"/>
- <exclude name="**/jpython/**" unless="jpython.present"/>
<exclude name="**/jython/**" unless="jython.present"/>
<exclude name="**/netrexx/**" unless="netrexx.present"/>
<exclude name="**/xslt/**" unless="xalan.present"/>
@@ -328,9 +314,11 @@
<!-- =================================================================== -->
<target name="javadocs" if="javadoc.required"
description="Generates the API documentation."
- depends="prepare" >
+ depends="compile" >
<mkdir dir="${build.javadocs}"/>
+ <!-- FIXME: Excluding some packages temporarily -->
<javadoc packagenames="${packages}"
+ excludepackagenames="org.apache.bsf.engines.java,
org.apache.bsf.engines.javaclass, org.apache.bsf.engines.activescript"
sourcepath="${src.dir}"
destdir="${build.javadocs}"
author="true"
1.6 +1 -1 jakarta-bsf/src/org/apache/bsf/BSFManager.java
Index: BSFManager.java
===================================================================
RCS file: /home/cvs/jakarta-bsf/src/org/apache/bsf/BSFManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BSFManager.java 14 Jun 2004 17:29:39 -0000 1.5
+++ BSFManager.java 14 Jun 2004 19:19:32 -0000 1.6
@@ -531,7 +531,7 @@
* Determine the language of a script file by looking at the file
* extension.
*
- * @param filename the name of the file
+ * @param fileName the name of the file
*
* @return the scripting language the file is in if the file extension
* is known to me (must have been registered via
1.5 +2 -2
jakarta-bsf/src/org/apache/bsf/engines/netrexx/NetRexxEngine.java
Index: NetRexxEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-bsf/src/org/apache/bsf/engines/netrexx/NetRexxEngine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NetRexxEngine.java 14 Jun 2004 17:29:40 -0000 1.4
+++ NetRexxEngine.java 14 Jun 2004 19:19:32 -0000 1.5
@@ -166,13 +166,13 @@
}
/**
* Return an object from an extension.
- * @param Object object from which to call our static method
+ * @param object object from which to call our static method
* @param method The name of the method to call.
* @param args an array of arguments to be
* passed to the extension, which may be either
* Vectors of Nodes, or Strings.
*/
- public Object call (Object object,String method, Object[] args)
+ public Object call (Object object, String method, Object[] args)
throws BSFException
{
throw new BSFException(BSFException.REASON_UNSUPPORTED_FEATURE,
1.3 +2 -2 jakarta-bsf/src/org/apache/bsf/util/ReflectionUtils.java
Index: ReflectionUtils.java
===================================================================
RCS file: /home/cvs/jakarta-bsf/src/org/apache/bsf/util/ReflectionUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReflectionUtils.java 14 Jun 2004 17:29:40 -0000 1.2
+++ ReflectionUtils.java 14 Jun 2004 19:19:32 -0000 1.3
@@ -149,7 +149,7 @@
* Create a bean using given class loader and using the appropriate
* constructor for the given args of the given arg types.
- * @param cl the class loader to use. If null, Class.forName is used.
+ * @param cld the class loader to use. If null, Class.forName is used.
* @param className name of class to instantiate
* @param argTypes array of argument types
* @param args array of arguments
@@ -189,7 +189,7 @@
* constructor for the given args. Figures out the arg types and
* calls above.
- * @param cl the class loader to use. If null, Class.forName is used.
+ * @param cld the class loader to use. If null, Class.forName is used.
* @param className name of class to instantiate
* @param args array of arguments
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
