henning 2003/03/19 08:09:47
Modified: src/java/org/apache/turbine/services/jsp TurbineJsp.java
src/java/org/apache/turbine/services/pull PullService.java
TurbinePull.java TurbinePullService.java
src/java/org/apache/turbine/services/uniqueid
UniqueIdService.java
src/java/org/apache/turbine/services/upload
UploadService.java
src/java/org/apache/turbine/services/velocity
VelocityService.java
Log:
Remove some unused imports
Fix up some javadocs
remove a few "static final" from Interfaces
Revision Changes Path
1.3 +0 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJsp.java
Index: TurbineJsp.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJsp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineJsp.java 9 Mar 2003 03:06:28 -0000 1.2
+++ TurbineJsp.java 19 Mar 2003 16:09:46 -0000 1.3
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.RunData;
1.7 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/pull/PullService.java
Index: PullService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/PullService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PullService.java 12 Mar 2003 22:57:56 -0000 1.6
+++ PullService.java 19 Mar 2003 16:09:46 -0000 1.7
@@ -169,7 +169,7 @@
* Shoud we refresh the tools
* on each request. For development purposes.
*
- * returns true if we should refresh the tools on every request.
+ * @return true if we should refresh the tools on every request.
*/
boolean refreshToolsPerRequest();
1.5 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/pull/TurbinePull.java
Index: TurbinePull.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/TurbinePull.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbinePull.java 12 Mar 2003 22:44:57 -0000 1.4
+++ TurbinePull.java 19 Mar 2003 16:09:46 -0000 1.5
@@ -171,7 +171,7 @@
* Shoud we refresh the tools
* on each request. For development purposes.
*
- * returns true if we should refresh the tools on every request.
+ * @return true if we should refresh the tools on every request.
*/
public static final boolean refreshToolsPerRequest()
{
1.18 +8 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Index: TurbinePullService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TurbinePullService.java 13 Mar 2003 15:39:54 -0000 1.17
+++ TurbinePullService.java 19 Mar 2003 16:09:46 -0000 1.18
@@ -88,7 +88,7 @@
* <pre>
* tool.<scope>.<id> = <classname>
*
- * <scope> is the tool scope: global, request, session
+ * <scope> is the tool scope: global, request, session,
* authorized or persistent (see below for more details)
* <id> is the name of the tool in the context
*
@@ -245,7 +245,7 @@
/**
* Initialize the pull service
*
- * @exception Exception, a generic exception.
+ * @exception Exception A problem happened when starting up
*/
private void initPullService()
throws Exception
@@ -395,7 +395,7 @@
//
// Session Tool start right at the session once the user has been set
- // while persistent Tools are started when the user has logged in
+ // while persistent and authorized Tools are started when the user has
logged in
//
User user = data.getUser();
@@ -568,6 +568,8 @@
/**
* Return the absolute path to the resources directory
* used by the application tools.
+ *
+ * @return the absolute path of the resources directory
*/
public String getAbsolutePathToResourcesDirectory()
{
@@ -577,6 +579,8 @@
/**
* Return the resources directory. This is
* relative to the web context.
+ *
+ * @return the relative path of the resources directory
*/
public String getResourcesDirectory()
{
1.5 +2 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/uniqueid/UniqueIdService.java
Index: UniqueIdService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/uniqueid/UniqueIdService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UniqueIdService.java 9 Mar 2003 03:06:34 -0000 1.4
+++ UniqueIdService.java 19 Mar 2003 16:09:47 -0000 1.5
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-// Turbine stuff.
-
import org.apache.turbine.services.Service;
/**
@@ -68,7 +66,7 @@
public interface UniqueIdService
extends Service
{
- static final String SERVICE_NAME = "UniqueIdService";
+ String SERVICE_NAME = "UniqueIdService";
/**
* <p> Returs an identifer of this Turbine instance that is unique
1.7 +19 -19
jakarta-turbine-2/src/java/org/apache/turbine/services/upload/UploadService.java
Index: UploadService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/upload/UploadService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UploadService.java 9 Mar 2003 03:06:34 -0000 1.6
+++ UploadService.java 19 Mar 2003 16:09:47 -0000 1.7
@@ -77,50 +77,50 @@
/**
* HTTP header.
*/
- static final String CONTENT_TYPE = "Content-type";
+ String CONTENT_TYPE = "Content-type";
/**
* HTTP header.
*/
- static final String CONTENT_DISPOSITION = "Content-disposition";
+ String CONTENT_DISPOSITION = "Content-disposition";
/**
* HTTP header base type.
*/
- static final String MULTIPART = "multipart";
+ String MULTIPART = "multipart";
/**
* HTTP header base type modifier.
*/
- static final String FORM_DATA = "form-data";
+ String FORM_DATA = "form-data";
/**
* HTTP header base type modifier.
*/
- static final String MIXED = "mixed";
+ String MIXED = "mixed";
/**
* HTTP header.
*/
- static final String MULTIPART_FORM_DATA =
+ String MULTIPART_FORM_DATA =
MULTIPART + '/' + FORM_DATA;
/**
* HTTP header.
*/
- static final String MULTIPART_MIXED = MULTIPART + '/' + MIXED;
+ String MULTIPART_MIXED = MULTIPART + '/' + MIXED;
/**
* The key in the TurbineResources.properties that references this
* service.
*/
- static final String SERVICE_NAME = "UploadService";
+ String SERVICE_NAME = "UploadService";
/**
* The key in UploadService properties in
* TurbineResources.properties 'automatic' property.
*/
- static final String AUTOMATIC_KEY = "automatic";
+ String AUTOMATIC_KEY = "automatic";
/**
* <p> The default value of 'automatic' property
@@ -131,19 +131,19 @@
* request by calling [EMAIL PROTECTED] #parseRequest(HttpServletRequest,
* ParameterParser, String) parseRequest} manually.
*/
- static final String AUTOMATIC_DEFAULT = "false";
+ String AUTOMATIC_DEFAULT = "false";
/**
* The request parameter name for overriding 'repository' property
* (path).
*/
- static final String REPOSITORY_PARAMETER = "path";
+ String REPOSITORY_PARAMETER = "path";
/**
* The key in UploadService properties in
* TurbineResources.properties 'repository' property.
*/
- static final String REPOSITORY_KEY = "repository";
+ String REPOSITORY_KEY = "repository";
/**
* <p> The default value of 'repository' property (.). This is
@@ -151,13 +151,13 @@
* Note that "." is whatever the servlet container chooses to be
* it's 'current directory'.
*/
- static final String REPOSITORY_DEFAULT = ".";
+ String REPOSITORY_DEFAULT = ".";
/**
- *w The key in UploadService properties in
+ * The key in UploadService properties in
* TurbineResources.properties 'size.max' property.
*/
- static final String SIZE_MAX_KEY = "size.max";
+ String SIZE_MAX_KEY = "size.max";
/**
* <p> The default value of 'size.max' property (1 megabyte =
@@ -167,13 +167,13 @@
* value, and use an action + no auto upload to enforce limits.
*
*/
- static final Integer SIZE_MAX_DEFAULT = new Integer(1048576);
+ Integer SIZE_MAX_DEFAULT = new Integer(1048576);
/**
* The key in UploadService properties in
* TurbineResources.properties 'size.threshold' property.
*/
- static final String SIZE_THRESHOLD_KEY = "size.threshold";
+ String SIZE_THRESHOLD_KEY = "size.threshold";
/**
* <p> The default value of 'size.threshold' property (10
@@ -181,7 +181,7 @@
* request that will have it's components stored temporarily in
* memory, instead of disk.
*/
- static final Integer SIZE_THRESHOLD_DEFAULT = new Integer(10240);
+ Integer SIZE_THRESHOLD_DEFAULT = new Integer(10240);
/**
* <p> This method performs parsing the request, and storing the
1.9 +5 -5
jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/VelocityService.java
Index: VelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/VelocityService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VelocityService.java 14 Mar 2003 17:29:09 -0000 1.8
+++ VelocityService.java 19 Mar 2003 16:09:47 -0000 1.9
@@ -76,16 +76,16 @@
extends Service
{
/** The Service Name */
- static final String SERVICE_NAME = "VelocityService";
+ String SERVICE_NAME = "VelocityService";
/** Key for storing the Context in the RunData object */
- static final String CONTEXT = "VELOCITY_CONTEXT";
+ String CONTEXT = "VELOCITY_CONTEXT";
/** The default extension of Velocity Pages */
- static final String VELOCITY_EXTENSION = "vm";
+ String VELOCITY_EXTENSION = "vm";
/** The Key for storing the RunData Object in the Context */
- static final String RUNDATA_KEY = "data";
+ String RUNDATA_KEY = "data";
/**
* Process the request and fill in the template with the values
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
