You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/12/29 09:54:17 UTC
svn commit: r359757 - in /cocoon:
blocks/spring-app/trunk/java/org/apache/cocoon/spring/
blocks/template/trunk/java/org/apache/cocoon/template/instruction/
blocks/template/trunk/java/org/apache/cocoon/template/script/event/
blocks/validation/trunk/java...
Author: cziegeler
Date: Thu Dec 29 00:53:30 2005
New Revision: 359757
URL: http://svn.apache.org/viewcvs?rev=359757&view=rev
Log:
Clean up code
Modified:
cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonApplicationContext.java
cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Call.java
cocoon/blocks/template/trunk/java/org/apache/cocoon/template/script/event/StartDocument.java
cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/Validator.java
cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/impl/AbstractValidator.java
cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/jing/JingResolver.java
cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryPropertyHelper.java
cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryTransactionHelper.java
cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java
cocoon/blocks/xmldb/trunk/java/org/apache/cocoon/components/source/impl/XMLDBSource.java
cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/Logicsheet.java
cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java
cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
cocoon/trunk/src/java/org/apache/cocoon/blocks/BlockManager.java
cocoon/trunk/src/java/org/apache/cocoon/blocks/BlocksManager.java
cocoon/trunk/src/java/org/apache/cocoon/blocks/CoreUtil.java
cocoon/trunk/src/java/org/apache/cocoon/blocks/LoggerUtil.java
cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImplMBean.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
cocoon/trunk/src/java/org/apache/cocoon/components/thread/DefaultThreadPool.java
cocoon/trunk/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
cocoon/trunk/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java
cocoon/trunk/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/Part.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/PartInMemory.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/PartOnDisk.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/TokenStream.java
cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapExecutor.java
cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapModelComponent.java
cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapParameters.java
cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/AbstractVirtualSitemapComponent.java
cocoon/trunk/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
cocoon/trunk/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractDOMFragment.java
cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractSAXFragment.java
cocoon/trunk/src/test/org/apache/cocoon/test/ServletTestCase.java
Modified: cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonApplicationContext.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonApplicationContext.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonApplicationContext.java (original)
+++ cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonApplicationContext.java Thu Dec 29 00:53:30 2005
@@ -22,7 +22,6 @@
import org.apache.cocoon.environment.internal.EnvironmentHelper;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.web.context.support.XmlWebApplicationContext;
Modified: cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Call.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Call.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Call.java (original)
+++ cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Call.java Thu Dec 29 00:53:30 2005
@@ -156,7 +156,6 @@
/**
* @param executionContext
- * @return
* @throws SAXParseException
*/
private Define resolveMacroDefinition(
@@ -189,7 +188,7 @@
}
/**
- * @param startElement
+ * @param body
*/
public void setBody(Event body) {
this.body = body;
Modified: cocoon/blocks/template/trunk/java/org/apache/cocoon/template/script/event/StartDocument.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/org/apache/cocoon/template/script/event/StartDocument.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/java/org/apache/cocoon/template/script/event/StartDocument.java (original)
+++ cocoon/blocks/template/trunk/java/org/apache/cocoon/template/script/event/StartDocument.java Thu Dec 29 00:53:30 2005
@@ -76,8 +76,7 @@
}
/**
- * @param validity
- * @return
+ * @param name
*/
public Object getTemplateProperty(String name) {
return getTemplateProperties().get(name);
Modified: cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/Validator.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/Validator.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/Validator.java (original)
+++ cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/Validator.java Thu Dec 29 00:53:30 2005
@@ -88,8 +88,8 @@
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the grammar language of the specified schema
* could not be detected or was not supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(String uri)
throws IOException, SAXException, ValidatorException;
@@ -108,8 +108,8 @@
* @throws IOException if an I/O error occurred parsing the schema.
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the specified grammar language wasn't supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(String uri, String grammar)
throws IOException, SAXException, ValidatorException;
@@ -131,8 +131,8 @@
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the grammar language of the specified schema
* could not be detected or was not supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(String uri, ErrorHandler errorHandler)
throws IOException, SAXException, ValidatorException;
@@ -153,8 +153,8 @@
* @throws IOException if an I/O error occurred parsing the schema.
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the specified grammar language wasn't supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(String uri, String grammar,
ErrorHandler errorHandler)
@@ -176,8 +176,8 @@
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the grammar language of the specified schema
* could not be detected or was not supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(Source source)
throws IOException, SAXException, ValidatorException;
@@ -196,8 +196,8 @@
* @throws IOException if an I/O error occurred parsing the schema.
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the specified grammar language wasn't supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(Source source, String grammar)
throws IOException, SAXException, ValidatorException;
@@ -219,8 +219,8 @@
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the grammar language of the specified schema
* could not be detected or was not supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(Source source,
ErrorHandler errorHandler)
@@ -242,8 +242,8 @@
* @throws IOException if an I/O error occurred parsing the schema.
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the specified grammar language wasn't supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(Source source, String grammar,
ErrorHandler errorHandler)
Modified: cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/impl/AbstractValidator.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/impl/AbstractValidator.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/impl/AbstractValidator.java (original)
+++ cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/impl/AbstractValidator.java Thu Dec 29 00:53:30 2005
@@ -115,8 +115,8 @@
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the grammar language of the specified schema
* could not be detected or was not supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(String uri)
throws IOException, SAXException, ValidatorException {
@@ -137,8 +137,8 @@
* @throws IOException if an I/O error occurred parsing the schema.
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the specified grammar language wasn't supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(String uri, String grammar)
throws IOException, SAXException, ValidatorException {
@@ -162,8 +162,8 @@
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the grammar language of the specified schema
* could not be detected or was not supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(String uri, ErrorHandler errorHandler)
throws IOException, SAXException, ValidatorException {
@@ -186,8 +186,8 @@
* @throws IOException if an I/O error occurred parsing the schema.
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the specified grammar language wasn't supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(String uri, String grammar,
ErrorHandler errorHandler)
@@ -218,8 +218,8 @@
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the grammar language of the specified schema
* could not be detected or was not supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(Source source)
throws IOException, SAXException, ValidatorException {
@@ -240,8 +240,8 @@
* @throws IOException if an I/O error occurred parsing the schema.
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the specified grammar language wasn't supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(Source source, String grammar)
throws IOException, SAXException, ValidatorException {
@@ -265,8 +265,8 @@
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the grammar language of the specified schema
* could not be detected or was not supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(Source source,
ErrorHandler errorHandler)
@@ -290,8 +290,8 @@
* @throws IOException if an I/O error occurred parsing the schema.
* @throws SAXException if a grammar error occurred parsing the schema.
* @throws ValidatorException if the specified grammar language wasn't supported.
- * @link SchemaParser#getSchema(String, String)
- * @link Schema#createValidator(ErrorHandler)
+ * @see SchemaParser#parseSchema(Source, String)
+ * @see Schema#createValidator(ErrorHandler)
*/
public ValidationHandler getValidationHandler(Source source, String grammar,
ErrorHandler errorHandler)
Modified: cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/jing/JingResolver.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/jing/JingResolver.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/jing/JingResolver.java (original)
+++ cocoon/blocks/validation/trunk/java/org/apache/cocoon/components/validation/jing/JingResolver.java Thu Dec 29 00:53:30 2005
@@ -132,7 +132,7 @@
* {@link Stack} of {@link InputSource}s kept for URI resolution as explained
* in the description of the {@link #resolveEntity(String, String)} method.</p>
*
- * @link JingReader
+ * @see JingReader
* @return a <b>non-null</b> {@link XMLReader} instance.
* @throws SAXException if an error occurrent creating the {@link XMLReader}.
*/
Modified: cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java (original)
+++ cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java Thu Dec 29 00:53:30 2005
@@ -101,9 +101,9 @@
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize() throws Exception {
- this.propertyHelper = new WebDAVRepositoryPropertyHelper(this.credentials, this);
+ this.propertyHelper = new WebDAVRepositoryPropertyHelper(this);
this.transactionHelper = new WebDAVRepositoryTransactionHelper(this.credentials, this);
- this.versioningHelper = new WebDAVRepositoryVersioningHelper(this.credentials, this);
+ this.versioningHelper = new WebDAVRepositoryVersioningHelper(this);
LifecycleHelper lh = new LifecycleHelper(this.getLogger(),
null,
this.manager,
@@ -118,9 +118,6 @@
*/
public void dispose() {
this.manager = null;
- this.propertyHelper.dispose();
- this.transactionHelper.dispose();
- this.versioningHelper.dispose();
this.propertyHelper = null;
this.transactionHelper = null;
this.versioningHelper = null;
Modified: cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryPropertyHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryPropertyHelper.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryPropertyHelper.java (original)
+++ cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryPropertyHelper.java Thu Dec 29 00:53:30 2005
@@ -23,13 +23,8 @@
import javax.xml.transform.OutputKeys;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.repository.helpers.CredentialsToken;
import org.apache.cocoon.components.repository.helpers.RepositoryPropertyHelper;
import org.apache.cocoon.components.source.helpers.SourceProperty;
import org.apache.cocoon.components.webdav.WebDAVUtil;
@@ -42,39 +37,17 @@
* intended to be used by flowscripts or corresponding wrapper components.
*/
public class WebDAVRepositoryPropertyHelper extends AbstractLogEnabled
-implements RepositoryPropertyHelper, Serviceable, Disposable {
+implements RepositoryPropertyHelper {
- /* The ServiceManager */
- private ServiceManager manager;
-
/* The repository component */
private WebDAVRepository repo;
- /* The credentials to be used against the WebDAV repository */
- private CredentialsToken credentials;
-
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
- */
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
- }
-
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
- */
- public void dispose() {
- this.manager = null;
- }
-
/**
* create a WebDAVRepositoryPropertyHelper
*
- * @param credentials the user credentials to be used against the WebDAV repository.
* @param repo a reference to the WebDAVRepository object.
*/
- public WebDAVRepositoryPropertyHelper (CredentialsToken credentials, WebDAVRepository repo) {
- this.credentials = credentials;
+ public WebDAVRepositoryPropertyHelper(WebDAVRepository repo) {
this.repo = repo;
}
Modified: cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryTransactionHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryTransactionHelper.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryTransactionHelper.java (original)
+++ cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryTransactionHelper.java Thu Dec 29 00:53:30 2005
@@ -17,11 +17,7 @@
import java.io.IOException;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.components.repository.helpers.CredentialsToken;
import org.apache.cocoon.components.repository.helpers.RepositoryTransactionHelper;
import org.apache.cocoon.components.webdav.WebDAVUtil;
@@ -32,30 +28,13 @@
* intended to be used by flowscripts or corresponding wrapper components.
*/
public class WebDAVRepositoryTransactionHelper extends AbstractLogEnabled
-implements RepositoryTransactionHelper, Serviceable, Disposable {
+implements RepositoryTransactionHelper {
- /* The ServiceManager */
- private ServiceManager manager;
-
/* The repository component */
private WebDAVRepository repo;
/* The credentials to be used against the WebDAV repository */
private CredentialsToken credentials;
-
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
- */
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
- }
-
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
- */
- public void dispose() {
- this.manager = null;
- }
/**
* create a WebDAVRepositoryTransactionHelper
Modified: cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java (original)
+++ cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java Thu Dec 29 00:53:30 2005
@@ -18,12 +18,7 @@
import java.io.IOException;
import java.util.List;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.cocoon.components.repository.helpers.CredentialsToken;
import org.apache.cocoon.components.repository.helpers.RepositoryVersioningHelper;
import org.apache.cocoon.components.webdav.WebDAVUtil;
import org.apache.commons.httpclient.HttpException;
@@ -33,39 +28,17 @@
* intended to be used by flowscripts or corresponding wrapper components.
*/
public class WebDAVRepositoryVersioningHelper extends AbstractLogEnabled
-implements RepositoryVersioningHelper, Serviceable, Disposable {
+implements RepositoryVersioningHelper {
- /* The ServiceManager */
- private ServiceManager manager;
-
/* The repository component */
private WebDAVRepository repo;
- /* The credentials to be used against the WebDAV repository */
- private CredentialsToken credentials;
-
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
- */
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
- }
-
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
- */
- public void dispose() {
- this.manager = null;
- }
-
/**
* create a WebDAVRepositoryVersioningHelper
*
- * @param credentials the user credentials to be used against the WebDAV repository.
* @param repo a reference to the WebDAVRepository object.
*/
- public WebDAVRepositoryVersioningHelper (CredentialsToken credentials, WebDAVRepository repo) {
- this.credentials = credentials;
+ public WebDAVRepositoryVersioningHelper (WebDAVRepository repo) {
this.repo = repo;
}
Modified: cocoon/blocks/xmldb/trunk/java/org/apache/cocoon/components/source/impl/XMLDBSource.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xmldb/trunk/java/org/apache/cocoon/components/source/impl/XMLDBSource.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/xmldb/trunk/java/org/apache/cocoon/components/source/impl/XMLDBSource.java (original)
+++ cocoon/blocks/xmldb/trunk/java/org/apache/cocoon/components/source/impl/XMLDBSource.java Thu Dec 29 00:53:30 2005
@@ -151,9 +151,9 @@
* The constructor.
*
* @param logger the Logger instance.
- * @param credential username and password
+ * @param user username
+ * @param password password
* @param srcUrl the URL being queried.
- * @param manager component manager
*/
public XMLDBSource(Logger logger,
String user, String password,
Modified: cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java (original)
+++ cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java Thu Dec 29 00:53:30 2005
@@ -20,7 +20,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
@@ -40,7 +39,6 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
import java.io.IOException;
import java.net.MalformedURLException;
Modified: cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/Logicsheet.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/Logicsheet.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/Logicsheet.java (original)
+++ cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/Logicsheet.java Thu Dec 29 00:53:30 2005
@@ -25,11 +25,7 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceResolver;
-import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
import javax.xml.transform.sax.TransformerHandler;
Modified: cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java (original)
+++ cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java Thu Dec 29 00:53:30 2005
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
import org.apache.cocoon.components.language.markup.LogicsheetFilter;
import org.apache.cocoon.xml.AbstractXMLPipe;
import org.apache.cocoon.xml.AttributesImpl;
@@ -27,9 +26,7 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.XMLFilterImpl;
import java.util.LinkedList;
Modified: cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java (original)
+++ cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java Thu Dec 29 00:53:30 2005
@@ -19,13 +19,6 @@
import org.apache.cocoon.components.language.markup.LogicsheetFilter;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.xml.AbstractXMLPipe;
-import org.apache.cocoon.xml.XMLUtils;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-
-import java.util.Stack;
/**
* This class implements <code>MarkupLanguage</code> for Cocoon's
Modified: cocoon/trunk/src/java/org/apache/cocoon/blocks/BlockManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/blocks/BlockManager.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/blocks/BlockManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/blocks/BlockManager.java Thu Dec 29 00:53:30 2005
@@ -132,7 +132,6 @@
}
/**
- * @return
* @throws Exception
*/
protected Context getAvalonContext() throws Exception {
@@ -149,7 +148,6 @@
/**
* @param newContext
* @param confLocation
- * @return
* @throws Exception
*/
protected ServiceManager createLocalSourceResolverSM(Context newContext, ServiceManager parentServiceManager, String confLocation) throws Exception {
Modified: cocoon/trunk/src/java/org/apache/cocoon/blocks/BlocksManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/blocks/BlocksManager.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/blocks/BlocksManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/blocks/BlocksManager.java Thu Dec 29 00:53:30 2005
@@ -246,7 +246,6 @@
* The block with the largest mount point that is a prefix of the URI is
* chosen. The implementation could be made much more efficient.
* @param uri
- * @return
*/
public Block getMountedBlock(String uri) {
Block block = null;
Modified: cocoon/trunk/src/java/org/apache/cocoon/blocks/CoreUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/blocks/CoreUtil.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/blocks/CoreUtil.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/blocks/CoreUtil.java Thu Dec 29 00:53:30 2005
@@ -107,7 +107,7 @@
/**
* Setup a new instance.
* @param config
- * @throws Exception
+ * @throws ServletException
*/
public CoreUtil(ServletConfig config, String knownFile) throws ServletException {
this.config = config;
Modified: cocoon/trunk/src/java/org/apache/cocoon/blocks/LoggerUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/blocks/LoggerUtil.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/blocks/LoggerUtil.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/blocks/LoggerUtil.java Thu Dec 29 00:53:30 2005
@@ -76,10 +76,10 @@
private LoggerManager loggerManager;
private File contextForWriting;
- /**
+
+ /**
* Setup a new instance.
* @param config
- * @throws Exception
*/
public LoggerUtil(ServletConfig config, Context appContext, Settings settings) {
this.config = config;
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java Thu Dec 29 00:53:30 2005
@@ -229,7 +229,7 @@
}
/**
- * @param The JMX domain name
+ * @param jmxDomain JMX domain name
*/
public void setJmxDomain(final String jmxDomain) {
this.jmxDomain = jmxDomain;
@@ -246,7 +246,7 @@
}
/**
- * @param The JMX object name (without domain prefix)
+ * @param jmxName JMX object name (without domain prefix)
*/
public void setJmxName(final String jmxName) {
this.jmxName = jmxName;
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImplMBean.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImplMBean.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImplMBean.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImplMBean.java Thu Dec 29 00:53:30 2005
@@ -46,7 +46,7 @@
/**
* Construction of PoolableComponentHandlerMBean
*
- * @param handler The managed PoolableComponentHandler instance
+ * @param manager The managed ContinuationsManager instance
*/
public ContinuationsManagerImplMBean(final ContinuationsManagerImpl manager)
throws MBeanException, InstanceNotFoundException {
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Thu Dec 29 00:53:30 2005
@@ -64,7 +64,6 @@
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
import org.mozilla.javascript.WrappedException;
-import org.mozilla.javascript.Wrapper;
import org.mozilla.javascript.continuations.Continuation;
import org.mozilla.javascript.tools.debugger.Main;
import org.mozilla.javascript.tools.shell.Global;
@@ -693,17 +692,6 @@
Thread.currentThread().setContextClassLoader(savedClassLoader);
}
}
- }
-
- private Throwable unwrap(JavaScriptException e) {
- Object value = e.getValue();
- while (value instanceof Wrapper) {
- value = ((Wrapper)value).unwrap();
- }
- if (value instanceof Throwable) {
- return (Throwable)value;
- }
- return e;
}
public void forwardTo(Scriptable scope, FOM_Cocoon cocoon, String uri,
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/thread/DefaultThreadPool.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/thread/DefaultThreadPool.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/thread/DefaultThreadPool.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/thread/DefaultThreadPool.java Thu Dec 29 00:53:30 2005
@@ -182,7 +182,7 @@
}
/**
- * @see org.apache.cocoon.components.thread.ThreadPool#shutdownGraceful()
+ * @see org.apache.cocoon.components.thread.ThreadPool#shutdown()
*/
public void shutdown() {
if( m_shutdownGraceful ) {
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java Thu Dec 29 00:53:30 2005
@@ -212,7 +212,7 @@
ReInitRounds();
if (curChar < 64) {
long l = 1L << curChar;
- MatchLoop : do {
+ do {
switch (jjstateSet[--i]) {
case 0 :
if ((0x100002600L & l) != 0L)
@@ -246,7 +246,7 @@
} while (i != startsAt);
} else if (curChar < 128) {
long l = 1L << (curChar & 077);
- MatchLoop : do {
+ do {
switch (jjstateSet[--i]) {
case 0 :
if ((0x7fffffe87fffffeL & l) == 0L)
@@ -284,7 +284,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- MatchLoop : do {
+ do {
switch (jjstateSet[--i]) {
case 0 :
if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -405,7 +405,7 @@
ReInitRounds();
if (curChar < 64) {
long l = 1L << curChar;
- MatchLoop : do {
+ do {
switch (jjstateSet[--i]) {
case 0 :
if ((0xfffffcffffffffffL & l) != 0L)
@@ -417,7 +417,7 @@
} while (i != startsAt);
} else if (curChar < 128) {
long l = 1L << (curChar & 077);
- MatchLoop : do {
+ do {
switch (jjstateSet[--i]) {
case 0 :
if ((0xffffffffbfffffffL & l) != 0L)
@@ -433,7 +433,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- MatchLoop : do {
+ do {
switch (jjstateSet[--i]) {
case 0 :
if (jjCanMove_2(hiByte, i1, i2, l1, l2)
@@ -684,7 +684,7 @@
Token matchedToken;
int curPos = 0;
- EOFLoop : for (;;) {
+ for (;;) {
try {
curChar = input_stream.BeginToken();
} catch (java.io.IOException e) {
Modified: cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java Thu Dec 29 00:53:30 2005
@@ -117,7 +117,7 @@
final Map cocoon = new HashMap();
// Needed for the FOM wrappers
- Context cx = Context.enter();
+ Context.enter();
try {
// cocoon.request
final Request request = ObjectModelHelper.getRequest( objectModel );
@@ -176,7 +176,7 @@
objectModel.put( "Packages", javaPkg );
objectModel.put( "java", pkgs );
} else {
- Context cx = Context.enter();
+ Context.enter();
try {
final String JAVA_PACKAGE = "JavaPackage";
ClassLoader cl = Thread.currentThread().getContextClassLoader();
Modified: cocoon/trunk/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java Thu Dec 29 00:53:30 2005
@@ -71,7 +71,7 @@
public Map preparedMatch(Object preparedPattern, Map objectModel, Parameters parameters) throws PatternException {
if(preparedPattern == null) {
- throw new PatternException("A pattern is needed at " + SitemapParameters.getStatementLocation(parameters));
+ throw new PatternException("A pattern is needed at " + SitemapParameters.getLocation(parameters));
}
RE re = new RE((REProgram)preparedPattern);
Modified: cocoon/trunk/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java Thu Dec 29 00:53:30 2005
@@ -47,7 +47,7 @@
if(preparedPattern == null) {
throw new PatternException("A pattern is needed at " +
- SitemapParameters.getStatementLocation(parameters));
+ SitemapParameters.getLocation(parameters));
}
String match = getMatchString(objectModel, parameters);
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Thu Dec 29 00:53:30 2005
@@ -17,9 +17,7 @@
import java.io.File;
import java.io.IOException;
-import java.io.OutputStream;
import java.net.MalformedURLException;
-import java.net.SocketException;
import java.net.URL;
import java.util.HashMap;
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java Thu Dec 29 00:53:30 2005
@@ -318,8 +318,6 @@
*
* @param in
*
- * @return
- *
* @throws IOException
*/
private Hashtable readHeaders(TokenStream in) throws IOException {
@@ -352,7 +350,6 @@
*
* @param hdr
*
- * @return
*/
private String getBoundary(String hdr) {
@@ -367,8 +364,6 @@
* Read string until newline or end of stream
*
* @param in
- *
- * @return
*
* @throws IOException
*/
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/Part.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/Part.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/Part.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/Part.java Thu Dec 29 00:53:30 2005
@@ -110,7 +110,7 @@
/**
* Returns an InputStream containing the file data
- * @throws Exception
+ * @throws IOException
*/
public abstract InputStream getInputStream() throws IOException;
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/PartInMemory.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/PartInMemory.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/PartInMemory.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/PartInMemory.java Thu Dec 29 00:53:30 2005
@@ -60,7 +60,7 @@
/**
* Returns a (ByteArray)InputStream containing the file data
*
- * @throws Exception
+ * @throws IOException
*/
public InputStream getInputStream() throws IOException {
if (this.in != null) {
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/PartOnDisk.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/PartOnDisk.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/PartOnDisk.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/PartOnDisk.java Thu Dec 29 00:53:30 2005
@@ -72,7 +72,7 @@
/**
* Returns a (ByteArray)InputStream containing the file data
*
- * @throws Exception
+ * @throws IOException
*/
public InputStream getInputStream() throws IOException {
if (this.file != null) {
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/TokenStream.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/TokenStream.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/TokenStream.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/TokenStream.java Thu Dec 29 00:53:30 2005
@@ -111,7 +111,6 @@
/**
* Return the stream state
*
- * @return
*/
public int getState() {
return state;
@@ -126,8 +125,6 @@
*
* @param out The output buffer
*
- * @return
- *
* @throws IOException
*/
private int readToBoundary(byte[] out) throws IOException {
@@ -198,8 +195,6 @@
*
* @param out
*
- * @return
- *
* @throws IOException
*/
public int read(byte[] out) throws IOException {
@@ -216,8 +211,6 @@
* @param off
* @param len
*
- * @return
- *
* @throws IOException
*/
public int read(byte[] out, int off, int len) throws IOException {
@@ -240,8 +233,6 @@
/**
* @see java.io.InputStream#read()
- *
- * @return
*
* @throws IOException
*/
Modified: cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapExecutor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapExecutor.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapExecutor.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapExecutor.java Thu Dec 29 00:53:30 2005
@@ -92,7 +92,7 @@
* @param selector
* @param expression
* @param parameters
- * @return
+ * @return True if the selector did match.
*/
boolean invokeSelector(ExecutionContext context,
Map objectModel,
@@ -108,7 +108,7 @@
* @param expression
* @param parameters
* @param selectorContext The context object for the switch selector
- * @return
+ * @return True if the selector did match.
*/
boolean invokeSwitchSelector(ExecutionContext context,
Map objectModel,
@@ -205,7 +205,7 @@
* @param context
* @param objectModel
* @param desc
- * @return
+ * @return A (new) description for the pipeline component to use.
*/
PipelineComponentDescription enteringPipeline(ExecutionContext context,
Map objectModel,
Modified: cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapModelComponent.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapModelComponent.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapModelComponent.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapModelComponent.java Thu Dec 29 00:53:30 2005
@@ -54,7 +54,6 @@
*
* @throws SAXException if there is a problem reading a SAX stream.
* @throws IOException if there is a problem reading files.
- * @throws ResourceNotFoundException if the resource to be rendered cannot be found.
* @throws ProcessingException if there is any other unexpected problem.
*/
void setup(SourceResolver resolver, Map objectModel, String src, Parameters par)
Modified: cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapParameters.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapParameters.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapParameters.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapParameters.java Thu Dec 29 00:53:30 2005
@@ -34,7 +34,7 @@
this.location = location;
}
- /*
+ /**
* Get the location of the statement defining these parameters.
*
* @since 2.1.8
Modified: cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/AbstractVirtualSitemapComponent.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/AbstractVirtualSitemapComponent.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/AbstractVirtualSitemapComponent.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/AbstractVirtualSitemapComponent.java Thu Dec 29 00:53:30 2005
@@ -50,7 +50,6 @@
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -106,13 +105,13 @@
* Release all resources.
*/
public void recycle() {
- Iterator sources = this.sourceMap.values().iterator();
- while (sources.hasNext()) {
- Source source = (Source)sources.next();
- // FIXME
- // These are allready disposed, why?
- //this.resolver.release(source);
- }
+ // FIXME
+ // These are allready disposed, why?
+ //Iterator sources = this.sourceMap.values().iterator();
+ //while (sources.hasNext()) {
+ // Source source = (Source)sources.next();
+ // this.resolver.release(source);
+ //}
this.sourceMap.clear();
super.recycle();
}
Modified: cocoon/trunk/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java Thu Dec 29 00:53:30 2005
@@ -29,10 +29,8 @@
import org.apache.cocoon.transformation.helpers.IncludeCacheManager;
import org.apache.cocoon.transformation.helpers.IncludeCacheManagerSession;
import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.apache.cocoon.xml.NamespacesTable;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLUtils;
-import org.apache.cocoon.xml.NamespacesTable.Declaration;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
Modified: cocoon/trunk/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java Thu Dec 29 00:53:30 2005
@@ -1048,7 +1048,6 @@
* next value. If no more values exist, returns null.
*
* @param name
- * @return
*/
private Object getNextValue(String name) {
Object result = null;
Modified: cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractDOMFragment.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractDOMFragment.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractDOMFragment.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractDOMFragment.java Thu Dec 29 00:53:30 2005
@@ -30,7 +30,7 @@
* easily represented as a DOM.
*
* <p>The {@link #toSAX} method is implemented by streaming (using a
- * {@link DOMStreamer}) the results of the {@link #toDOM} that must be
+ * {@link DOMStreamer}) the results of the {@link #toDOM(Node)} that must be
* implemented by concrete subclasses.</p>
*
* @version $Id$
Modified: cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractSAXFragment.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractSAXFragment.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractSAXFragment.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractSAXFragment.java Thu Dec 29 00:53:30 2005
@@ -17,13 +17,14 @@
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.w3c.dom.Node;
+import org.xml.sax.ContentHandler;
/**
* Abstract implementation of {@link XMLFragment} for objects that are more
* easily represented as SAX events.
*
* <p>The {@link #toDOM} method is implemented by piping in a {@link DOMBuilder}
- * the results of {@link #toSAX} that must be implemented by concrete
+ * the results of {@link #toSAX(ContentHandler)} that must be implemented by concrete
* subclasses.</p>
*
* @version $Id$
Modified: cocoon/trunk/src/test/org/apache/cocoon/test/ServletTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/test/ServletTestCase.java?rev=359757&r1=359756&r2=359757&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/test/ServletTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/test/ServletTestCase.java Thu Dec 29 00:53:30 2005
@@ -31,7 +31,6 @@
import com.meterware.httpunit.GetMethodWebRequest;
import com.meterware.httpunit.WebRequest;
import com.meterware.httpunit.WebResponse;
-import com.meterware.servletunit.InvocationContext;
import com.meterware.servletunit.ServletRunner;
import com.meterware.servletunit.ServletUnitClient;
@@ -95,7 +94,7 @@
/**
* Load a binary document.
*
- * @param source Source location.
+ * @param input Stream containing the document.
*
* @return Binary data.
*/