You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2004/04/03 03:32:32 UTC
cvs commit: cocoon-2.1/src/blocks/bsf/java/org/apache/cocoon/generation ScriptGenerator.java
antonio 2004/04/02 17:32:32
Modified: . status.xml
src/blocks/bsf/java/org/apache/cocoon/acting
ScriptAction.java
lib jars.xml
src/blocks/bsf/java/org/apache/cocoon/generation
ScriptGenerator.java
Added: src/blocks/bsf/lib bsf-2.3.0.jar
legal bsf-2.3.0.jar.license.txt
Removed: src/blocks/bsf/lib bsf-2.2.jar
legal bsf-2.2.jar.license.txt
Log:
Update bsf.jar to 2.3.0 this is needed by Groovy :-D
Revision Changes Path
1.295 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/status.xml,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- status.xml 2 Apr 2004 21:32:33 -0000 1.294
+++ status.xml 3 Apr 2004 01:32:28 -0000 1.295
@@ -212,6 +212,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="AG" type="update">
+ Updated bsf to 2.3.0
+ </action>
<action dev="JH" type="fix" fixes-bug="15841">
"Fixed" bug 15841 by raising an exception when something is tried to add
to elements before attributes.
1.1 cocoon-2.1/src/blocks/bsf/lib/bsf-2.3.0.jar
<<Binary file>>
1.4 +6 -9 cocoon-2.1/src/blocks/bsf/java/org/apache/cocoon/acting/ScriptAction.java
Index: ScriptAction.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/bsf/java/org/apache/cocoon/acting/ScriptAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ScriptAction.java 5 Mar 2004 13:01:47 -0000 1.3
+++ ScriptAction.java 3 Apr 2004 01:32:29 -0000 1.4
@@ -15,8 +15,8 @@
*/
package org.apache.cocoon.acting;
-import com.ibm.bsf.BSFManager;
-import com.ibm.bsf.util.IOUtils;
+import org.apache.bsf.BSFManager;
+import org.apache.bsf.util.IOUtils;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -103,13 +103,10 @@
// Figure out what to return
// TODO: decide on a more robust communication method
- if ( actionMap.containsKey( "scriptaction-continue" ) )
- {
+ if ( actionMap.containsKey( "scriptaction-continue" )) {
return ( Collections.unmodifiableMap(actionMap) );
- }
- else
- {
- return ( null );
+ } else {
+ return (null);
}
} catch (Exception e) {
throw new ProcessingException(
1.1 cocoon-2.1/legal/bsf-2.3.0.jar.license.txt
Index: bsf-2.3.0.jar.license.txt
===================================================================
The Apache Software License, Version 1.1
Copyright (c) 2002 The Apache Software Foundation. All rights
reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
3. The end-user documentation included with the redistribution,
if any, must include the following acknowledgment:
"This product includes software developed by the
Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself,
if and wherever such third-party acknowledgments normally appear.
4. The names "BSF", "Apache", and "Apache Software Foundation" must
not be used to endorse or promote products derived from this
software without prior written permission. For written
permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache",
nor may "Apache" appear in their name, without prior written
permission of the Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Sanjiva Weerawarana and others at International Business Machines
Corporation. For more information on the Apache Software Foundation,
please see <http://www.apache.org/>.
1.200 +3 -3 cocoon-2.1/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/lib/jars.xml,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- jars.xml 1 Apr 2004 13:18:24 -0000 1.199
+++ jars.xml 3 Apr 2004 01:32:32 -0000 1.200
@@ -386,8 +386,8 @@
support the additional languages.
</description>
<used-by>Script generator, script action (bsf block)</used-by>
- <lib>bsf/lib/bsf-2.2.jar</lib>
- <homepage>http://oss.software.ibm.com/developerworks/projects/bsf</homepage>
+ <lib>bsf/lib/bsf-2.3.0.jar</lib>
+ <homepage>http://jakarta.apache.org/bsf/</homepage>
</file>
<file>
1.5 +4 -4 cocoon-2.1/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java
Index: ScriptGenerator.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ScriptGenerator.java 5 Mar 2004 13:01:47 -0000 1.4
+++ ScriptGenerator.java 3 Apr 2004 01:32:32 -0000 1.5
@@ -15,9 +15,9 @@
*/
package org.apache.cocoon.generation;
-import com.ibm.bsf.BSFException;
-import com.ibm.bsf.BSFManager;
-import com.ibm.bsf.util.IOUtils;
+import org.apache.bsf.BSFException;
+import org.apache.bsf.BSFManager;
+import org.apache.bsf.util.IOUtils;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;