Author: mrdon
Date: Sun Nov 27 18:15:59 2005
New Revision: 349343
URL: http://svn.apache.org/viewcvs?rev=349343&view=rev
Log:
Changing package from o.a.s.bsf to o.a.s.scripting
Added:
struts/scripting/trunk/src/java/org/apache/struts/scripting/
- copied from r349157,
struts/scripting/trunk/src/java/org/apache/struts/bsf/
Removed:
struts/scripting/trunk/src/java/org/apache/struts/bsf/
Modified:
struts/scripting/trunk/build.xml
struts/scripting/trunk/project.xml
struts/scripting/trunk/src/java/org/apache/struts/scripting/BSFManagerFilter.java
struts/scripting/trunk/src/java/org/apache/struts/scripting/RequestToVariableFilter.java
struts/scripting/trunk/src/java/org/apache/struts/scripting/ScriptAction.java
struts/scripting/trunk/src/java/org/apache/struts/scripting/StrutsInfo.java
struts/scripting/trunk/src/java/org/apache/struts/scripting/TestFilter.java
struts/scripting/trunk/src/struts-example/WEB-INF/struts-config-registration.xml
struts/scripting/trunk/src/struts-example/WEB-INF/struts-config.xml
struts/scripting/trunk/xdocs/index.xml
Modified: struts/scripting/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/build.xml?rev=349343&r1=349342&r2=349343&view=diff
==============================================================================
--- struts/scripting/trunk/build.xml (original)
+++ struts/scripting/trunk/build.xml Sun Nov 27 18:15:59 2005
@@ -36,7 +36,7 @@
<property name="build.example" value="${build.dir}/struts-example" />
<property name="build.target" value="${build.dir}/target" />
- <property name="javadoc.packages" value="org.apache.struts.bsf.*" />
+ <property name="javadoc.packages" value="org.apache.struts.scripting.*" />
<!-- ========== Derived Properties
======================================== -->
Modified: struts/scripting/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/project.xml?rev=349343&r1=349342&r2=349343&view=diff
==============================================================================
--- struts/scripting/trunk/project.xml (original)
+++ struts/scripting/trunk/project.xml Sun Nov 27 18:15:59 2005
@@ -31,11 +31,11 @@
<currentVersion>1.0-dev</currentVersion>
<inceptionYear>2003</inceptionYear>
- <package>org.apache.struts.bsf</package>
+ <package>org.apache.struts.scripting</package>
<packageGroups>
<packageGroup>
<title>Scriptable Struts Actions Using BSF</title>
- <packages>org.apache.struts.bsf</packages>
+ <packages>org.apache.struts.scripting</packages>
</packageGroup>
</packageGroups>
Modified:
struts/scripting/trunk/src/java/org/apache/struts/scripting/BSFManagerFilter.java
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/src/java/org/apache/struts/scripting/BSFManagerFilter.java?rev=349343&r1=349157&r2=349343&view=diff
==============================================================================
---
struts/scripting/trunk/src/java/org/apache/struts/scripting/BSFManagerFilter.java
(original)
+++
struts/scripting/trunk/src/java/org/apache/struts/scripting/BSFManagerFilter.java
Sun Nov 27 18:15:59 2005
@@ -1,4 +1,4 @@
-package org.apache.struts.bsf;
+package org.apache.struts.scripting;
import org.apache.bsf.BSFManager;
import java.util.Properties;
@@ -12,7 +12,7 @@
/**
* Initializes the filter. Properties can be retrieved as:
- *
<code>struts-bsf.filters.FILTER_NAME.PROPERTY_NAME=PROPERTY_VALUE</code>
+ *
<code>struts-scripting.filters.FILTER_NAME.PROPERTY_NAME=PROPERTY_VALUE</code>
* where FILTER_NAME is the "name" parameter.
*
* @param name The name of the filter
Modified:
struts/scripting/trunk/src/java/org/apache/struts/scripting/RequestToVariableFilter.java
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/src/java/org/apache/struts/scripting/RequestToVariableFilter.java?rev=349343&r1=349157&r2=349343&view=diff
==============================================================================
---
struts/scripting/trunk/src/java/org/apache/struts/scripting/RequestToVariableFilter.java
(original)
+++
struts/scripting/trunk/src/java/org/apache/struts/scripting/RequestToVariableFilter.java
Sun Nov 27 18:15:59 2005
@@ -1,4 +1,4 @@
-package org.apache.struts.bsf;
+package org.apache.struts.scripting;
import org.apache.bsf.BSFManager;
import org.apache.bsf.BSFException;
Modified:
struts/scripting/trunk/src/java/org/apache/struts/scripting/ScriptAction.java
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/src/java/org/apache/struts/scripting/ScriptAction.java?rev=349343&r1=349157&r2=349343&view=diff
==============================================================================
---
struts/scripting/trunk/src/java/org/apache/struts/scripting/ScriptAction.java
(original)
+++
struts/scripting/trunk/src/java/org/apache/struts/scripting/ScriptAction.java
Sun Nov 27 18:15:59 2005
@@ -1,4 +1,4 @@
-package org.apache.struts.bsf;
+package org.apache.struts.scripting;
import java.io.*;
import java.util.*;
@@ -51,24 +51,24 @@
* <li> <code>log</code> - A logging instance</li>
* </ul>
* You can add your own variables by creating a BSFManagerFilter and
- * configuring it in struts-bsf.properties:
+ * configuring it in struts-scripting.properties:
* <ul>
- * <li> <code>struts-bsf.filters.FILTER_NAME.class=FILTER_CLASS</code> - The
+ * <li>
<code>struts-scripting.filters.FILTER_NAME.class=FILTER_CLASS</code> - The
* class implementing BSFManagerFilter where FILTER_NAME is the name you are
* calling the filter.</li>
- * <li>
<code>struts-bsf.filters.FILTER_NAME.PROPERTY_NAME=PROPERTY_VALUE</code>
+ * <li>
<code>struts-scripting.filters.FILTER_NAME.PROPERTY_NAME=PROPERTY_VALUE</code>
* - A property to be used by the filter.</li>
* </ul>
* <br />
* <br />
* To use other scripting engines other than BeanShell, create a file called
- * <code>struts-bsf.properties</code> and add two properties for each engine:
+ * <code>struts-scripting.properties</code> and add two properties for each
engine:
*
* <ul>
- * <li> <code>struts-bsf.engine.ENGINE_NAME.class</code> - The class of the
+ * <li> <code>struts-scripting.engine.ENGINE_NAME.class</code> - The class
of the
* BSF engine where ENGINE_NAME is the name you are calling the engine.</li>
*
- * <li> <code>struts-bsf.engine.ENGINE_NAME.extensions</code> - A
+ * <li> <code>struts-scripting.engine.ENGINE_NAME.extensions</code> - A
* comma-delimited list of file extensions that will be used to identify the
* engine to use to execute the script.</li>
* </ul>
@@ -81,13 +81,13 @@
protected static Log log = LogFactory.getLog(ScriptAction.class);
/** The default path to the properties file */
- protected final static String PROPS_PATH = "/struts-bsf.properties";
+ protected final static String PROPS_PATH = "/struts-scripting.properties";
/** The base property for alternate BSF engines */
- protected final static String ENGINE_BASE = "struts-bsf.engine.";
+ protected final static String ENGINE_BASE = "struts-scripting.engine.";
/** The base property for classes that put new variables in the context */
- protected final static String FILTERS_BASE = "struts-bsf.filters.";
+ protected final static String FILTERS_BASE = "struts-scripting.filters.";
/** A list of initialized filters */
protected static BSFManagerFilter[] filters = null;
@@ -98,10 +98,22 @@
static {
Properties props = new Properties();
try {
- props.load(ScriptAction.class.getClassLoader().getResourceAsStream(
- PROPS_PATH));
+ InputStream in =
ScriptAction.class.getClassLoader().getResourceAsStream(PROPS_PATH);
+ if (in == null) {
+ in =
ScriptAction.class.getClassLoader().getResourceAsStream("/struts-bsf.properties");
+ if (in != null) {
+ log.warn("The struts-bsf.properties file has been
deprecated. Please use "+
+ "struts-scripting.properties instead.");
+ } else {
+ log.warn("struts-scripting.properties not found, using
default engine mappings.");
+ }
+ }
+
+ if (in != null) {
+ props.load(in);
+ }
} catch (Exception ex) {
- log.warn("struts-bsf.properties not found, using default engine
mappings.");
+ log.warn("Unable to load struts-scripting.properties, using
default engine mappings.");
}
int pos = ENGINE_BASE.length();
for (Enumeration e = props.propertyNames(); e.hasMoreElements(); ) {
Modified:
struts/scripting/trunk/src/java/org/apache/struts/scripting/StrutsInfo.java
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/src/java/org/apache/struts/scripting/StrutsInfo.java?rev=349343&r1=349157&r2=349343&view=diff
==============================================================================
--- struts/scripting/trunk/src/java/org/apache/struts/scripting/StrutsInfo.java
(original)
+++ struts/scripting/trunk/src/java/org/apache/struts/scripting/StrutsInfo.java
Sun Nov 27 18:15:59 2005
@@ -1,4 +1,4 @@
-package org.apache.struts.bsf;
+package org.apache.struts.scripting;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionForm;
Modified:
struts/scripting/trunk/src/java/org/apache/struts/scripting/TestFilter.java
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/src/java/org/apache/struts/scripting/TestFilter.java?rev=349343&r1=349157&r2=349343&view=diff
==============================================================================
--- struts/scripting/trunk/src/java/org/apache/struts/scripting/TestFilter.java
(original)
+++ struts/scripting/trunk/src/java/org/apache/struts/scripting/TestFilter.java
Sun Nov 27 18:15:59 2005
@@ -1,4 +1,4 @@
-package org.apache.struts.bsf;
+package org.apache.struts.scripting;
import org.apache.bsf.BSFManager;
import java.util.Properties;
Modified:
struts/scripting/trunk/src/struts-example/WEB-INF/struts-config-registration.xml
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/src/struts-example/WEB-INF/struts-config-registration.xml?rev=349343&r1=349342&r2=349343&view=diff
==============================================================================
---
struts/scripting/trunk/src/struts-example/WEB-INF/struts-config-registration.xml
(original)
+++
struts/scripting/trunk/src/struts-example/WEB-INF/struts-config-registration.xml
Sun Nov 27 18:15:59 2005
@@ -51,7 +51,7 @@
<!-- Matches all edit actions (in this case, only user regstration) -->
<action path="/Edit*"
- type="org.apache.struts.bsf.ScriptAction"
+ type="org.apache.struts.scripting.ScriptAction"
parameter="/WEB-INF/scripts/Edit{1}.bsh"
name="{1}Form"
scope="request"
@@ -61,7 +61,7 @@
<!-- Matches all save actions (in this case, only user registration) -->
<action path="/Save*"
- type="org.apache.struts.bsf.ScriptAction"
+ type="org.apache.struts.scripting.ScriptAction"
parameter="/WEB-INF/scripts/Save{1}.bsh"
name="{1}Form"
scope="request"
Modified: struts/scripting/trunk/src/struts-example/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/src/struts-example/WEB-INF/struts-config.xml?rev=349343&r1=349342&r2=349343&view=diff
==============================================================================
--- struts/scripting/trunk/src/struts-example/WEB-INF/struts-config.xml
(original)
+++ struts/scripting/trunk/src/struts-example/WEB-INF/struts-config.xml Sun Nov
27 18:15:59 2005
@@ -61,7 +61,7 @@
<!-- Display welcome page -->
<action path="/Welcome"
- type="org.apache.struts.bsf.ScriptAction"
+ type="org.apache.struts.scripting.ScriptAction"
parameter="/WEB-INF/scripts/Welcome.bsh">
<forward name="failure" path="/Error.jsp" />
<forward name="success" path="/welcome.jsp" />
@@ -70,7 +70,7 @@
<!-- Change locale action -->
<action
path="/Locale"
- type="org.apache.struts.bsf.ScriptAction"
+ type="org.apache.struts.scripting.ScriptAction"
parameter="/WEB-INF/scripts/Locale.bsh?defaultTarget=welcome" />
<!-- Display registration page -->
@@ -87,7 +87,7 @@
<!-- Process a user logon -->
<action path="/SubmitLogon"
- type="org.apache.struts.bsf.ScriptAction"
+ type="org.apache.struts.scripting.ScriptAction"
parameter="/WEB-INF/scripts/Logon.bsh"
name="LogonForm"
scope="request"
@@ -100,14 +100,14 @@
<!-- Process a user logoff -->
<action path="/Logoff"
- type="org.apache.struts.bsf.ScriptAction"
+ type="org.apache.struts.scripting.ScriptAction"
parameter="/WEB-INF/scripts/Logoff.bsh">
<forward name="success" path="/Welcome.do"/>
</action>
<!-- Edit mail subscription -->
<action path="/EditSubscription"
- type="org.apache.struts.bsf.ScriptAction"
+ type="org.apache.struts.scripting.ScriptAction"
parameter="/WEB-INF/scripts/EditSubscription.bsh"
name="SubscriptionForm"
scope="request"
@@ -118,7 +118,7 @@
<!-- Save mail subscription -->
<action path="/SaveSubscription"
- type="org.apache.struts.bsf.ScriptAction"
+ type="org.apache.struts.scripting.ScriptAction"
parameter="/WEB-INF/scripts/SaveSubscription.bsh"
name="SubscriptionForm"
scope="request"
Modified: struts/scripting/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/xdocs/index.xml?rev=349343&r1=349342&r2=349343&view=diff
==============================================================================
--- struts/scripting/trunk/xdocs/index.xml (original)
+++ struts/scripting/trunk/xdocs/index.xml Sun Nov 27 18:15:59 2005
@@ -79,12 +79,12 @@
<p>To determine what script will be executed, the "parameter"
attribute of
the action mapping should contain the name of the script relative to
the web application root directory (i.e. http://server/app). In the
place of
- the traditional Action implementation, use the value
<code>org.apache.struts.bsf.ScriptAction</code>.
+ the traditional Action implementation, use the value
<code>org.apache.struts.scripting.ScriptAction</code>.
For example:
</p>
<pre>
<action path="/logoff"
- type="org.apache.struts.bsf.ScriptAction"
+ type="org.apache.struts.scripting.ScriptAction"
parameter="/WEB-INF/scripts/Logoff.bsh">
<forward name="success" path="/index.jsp"/>
</action>
@@ -117,23 +117,23 @@
</ul>
<p>
You can add your own variables by creating a BSFManagerFilter and
- configuring it in struts-bsf.properties:
+ configuring it in struts-scripting.properties:
</p>
<ul>
- <li><code>struts-bsf.filters.FILTER_NAME.class=FILTER_CLASS</code>
- The
+
<li><code>struts-scripting.filters.FILTER_NAME.class=FILTER_CLASS</code> - The
class implementing BSFManagerFilter where FILTER_NAME is the
name you
are calling the filter.</li>
-
<li><code>struts-bsf.filters.FILTER_NAME.PROPERTY_NAME=PROPERTY_VALUE</code>
+
<li><code>struts-scripting.filters.FILTER_NAME.PROPERTY_NAME=PROPERTY_VALUE</code>
- A property to be used by the filter.</li>
</ul>
<p>
To use other scripting engines other than BeanShell, create a file
called
- <code>struts-bsf.properties</code> and add two properties for each
engine:
+ <code>struts-scripting.properties</code> and add two properties for
each engine:
</p>
<ul>
- <li><code>struts-bsf.engine.ENGINE_NAME.class</code> - The class of
the BSF
+ <li><code>struts-scripting.engine.ENGINE_NAME.class</code> - The
class of the BSF
engine where ENGINE_NAME is the name you are calling the
engine.</li>
- <li><code>struts-bsf.engine.ENGINE_NAME.extensions</code> - A
comma-delimited
+ <li><code>struts-scripting.engine.ENGINE_NAME.extensions</code> - A
comma-delimited
list of file extensions that will be used to identify the
engine to use
to execute the script.</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
