You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/02/08 22:05:20 UTC
svn commit: r152937 - in lenya/trunk/src: java/org/apache/lenya/ac/file/
java/org/apache/lenya/ac/ldap/ java/org/apache/lenya/cms/ant/
java/org/apache/lenya/cms/cocoon/acting/
java/org/apache/lenya/cms/cocoon/transformation/
java/org/apache/lenya/cms/publication/
java/org/apache/lenya/cms/publishing/ java/org/apache/lenya/cms/rc/
java/org/apache/lenya/cms/scheduler/
java/org/apache/lenya/cms/site/usecases/ java/org/apache/lenya/cms/task/
java/org/apache/lenya/search/crawler/ java/org/apache/lenya/util/
java/org/apache/lenya/workflow/impl/ test/org/apache/lenya/cms/task/
Author: gregor
Date: Tue Feb 8 13:05:13 2005
New Revision: 152937
URL: http://svn.apache.org/viewcvs?view=rev&rev=152937
Log:
Made anonymous classes final inner classes
Modified:
lenya/trunk/src/java/org/apache/lenya/ac/file/FilePolicyManager.java
lenya/trunk/src/java/org/apache/lenya/ac/ldap/LDAPUser.java
lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyPoliciesTask.java
lenya/trunk/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java
lenya/trunk/src/java/org/apache/lenya/cms/ant/LinkRewriteTask.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/HTMLFormSaveAction.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultResourcesManager.java
lenya/trunk/src/java/org/apache/lenya/cms/publishing/StaticHTMLExporter.java
lenya/trunk/src/java/org/apache/lenya/cms/rc/RCEnvironment.java
lenya/trunk/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java
lenya/trunk/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java
lenya/trunk/src/java/org/apache/lenya/search/crawler/HTMLHandler.java
lenya/trunk/src/java/org/apache/lenya/search/crawler/IterativeHTMLCrawler.java
lenya/trunk/src/java/org/apache/lenya/util/HTML.java
lenya/trunk/src/java/org/apache/lenya/util/TidyCommandLine.java
lenya/trunk/src/java/org/apache/lenya/workflow/impl/HistoryImpl.java
lenya/trunk/src/test/org/apache/lenya/cms/task/AntTaskTest.java
Modified: lenya/trunk/src/java/org/apache/lenya/ac/file/FilePolicyManager.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/ac/file/FilePolicyManager.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/ac/file/FilePolicyManager.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/ac/file/FilePolicyManager.java Tue Feb 8 13:05:13 2005
@@ -61,6 +61,34 @@
public class FilePolicyManager extends AbstractLogEnabled implements InheritingPolicyManager,
Parameterizable, Disposable, Serviceable {
+ private static final class SubtreeFileFilter implements FileFilter {
+ private final String url;
+ private final String subtree;
+
+ private SubtreeFileFilter(String _url, String _subtree) {
+ super();
+ this.url = _url;
+ this.subtree = _subtree;
+ }
+
+ /**
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File file) {
+ return file.getName().equals(this.subtree)
+ || file.getName().equals(this.url);
+ }
+ }
+
+ private static final class IsDirectoryFileFilter implements FileFilter {
+ /**
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File file) {
+ return file.isDirectory();
+ }
+ }
+
/**
* Creates a new FilePolicyManager.
*/
@@ -379,12 +407,7 @@
protected void removeAccreditable(AccreditableManager manager, Accreditable accreditable,
File policyDirectory) throws AccessControlException {
- File[] policyFiles = policyDirectory.listFiles(new FileFilter() {
- public boolean accept(File file) {
- return file.getName().equals(SUBTREE_FILENAME)
- || file.getName().equals(URL_FILENAME);
- }
- });
+ File[] policyFiles = policyDirectory.listFiles(new SubtreeFileFilter(URL_FILENAME, SUBTREE_FILENAME));
try {
RemovedAccreditablePolicyBuilder builder = new RemovedAccreditablePolicyBuilder(manager);
@@ -409,11 +432,7 @@
throw new AccessControlException(e1);
}
- File[] directories = policyDirectory.listFiles(new FileFilter() {
- public boolean accept(File file) {
- return file.isDirectory();
- }
- });
+ File[] directories = policyDirectory.listFiles(new IsDirectoryFileFilter());
for (int i = 0; i < directories.length; i++) {
removeAccreditable(manager, accreditable, directories[i]);
Modified: lenya/trunk/src/java/org/apache/lenya/ac/ldap/LDAPUser.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/ac/ldap/LDAPUser.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/ac/ldap/LDAPUser.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/ac/ldap/LDAPUser.java Tue Feb 8 13:05:13 2005
@@ -136,12 +136,15 @@
SearchResult entry = getDirectoryEntry(_ldapId);
exists = (entry != null);
-
- } catch (Exception e) {
- if (getLogger().isDebugEnabled())
- getLogger().debug("existsUser() for id " + _ldapId + " got exception: " + e);
- throw new AccessControlException("Exception during search: ", e);
- }
+ } catch (final IOException e) {
+ if (getLogger().isDebugEnabled())
+ getLogger().debug("existsUser() for id " + _ldapId + " got exception: " + e);
+ throw new AccessControlException("Exception during search: ", e);
+ } catch (final NamingException e) {
+ if (getLogger().isDebugEnabled())
+ getLogger().debug("existsUser() for id " + _ldapId + " got exception: " + e);
+ throw new AccessControlException("Exception during search: ", e);
+ }
return exists;
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyPoliciesTask.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyPoliciesTask.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyPoliciesTask.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyPoliciesTask.java Tue Feb 8 13:05:13 2005
@@ -32,7 +32,16 @@
* Ant task to copy the policies of a document
*/
public class CopyPoliciesTask extends TwoDocumentsOperationTask {
- private String policiesDir;
+ private static final class IsFileFileFilter implements FileFilter {
+ /**
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File file) {
+ return file.isFile();
+ }
+ }
+
+ private String policiesDir;
/**
*
@@ -61,12 +70,7 @@
* @return List of files
*/
public File[] getFiles(File directory) {
- FileFilter filter = new FileFilter() {
-
- public boolean accept(File file) {
- return file.isFile();
- }
- };
+ FileFilter filter = new IsFileFileFilter();
if (directory.exists() && directory.isDirectory()) {
return directory.listFiles(filter);
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java Tue Feb 8 13:05:13 2005
@@ -34,6 +34,15 @@
* Visitor of the defined subtree (visitor pattern). The subtree is reverse visited.
*/
public class DeletePoliciesTask extends TwoDocumentsOperationTask {
+ private static final class IsFileFileFilter implements FileFilter {
+ /**
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File file) {
+ return file.isFile();
+ }
+ }
+
private String policiesDir;
/**
@@ -63,12 +72,7 @@
* @return List of files
*/
public File[] getFiles(File directory) {
- FileFilter filter = new FileFilter() {
-
- public boolean accept(File file) {
- return file.isFile();
- }
- };
+ FileFilter filter = new IsFileFileFilter();
if (directory.exists() && directory.isDirectory()) {
return directory.listFiles(filter);
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ant/LinkRewriteTask.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ant/LinkRewriteTask.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ant/LinkRewriteTask.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ant/LinkRewriteTask.java Tue Feb 8 13:05:13 2005
@@ -48,6 +48,26 @@
*/
public class LinkRewriteTask extends PublicationTask {
+ private static final class XMLFilenameFilter implements FilenameFilter {
+ /**
+ * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
+ */
+ public boolean accept(File dir, String name) {
+ File _file = new File(dir, name);
+ return _file.isFile() && FileUtil.getExtension(name).equals("xml");
+ }
+ }
+
+ private static final class DirectoryFilter implements FilenameFilter {
+ /**
+ * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
+ */
+ public boolean accept(File dir, String name) {
+ File _file = new File(dir, name);
+ return _file.isDirectory();
+ }
+ }
+
private String baseDir;
private String stylesheet;
private String area;
@@ -128,7 +148,6 @@
/**
* Get the base dir.
- *
* @return the base dir
*/
private String getBaseDir() {
@@ -166,21 +185,9 @@
private void replace_internal(File file, Transformer transformer)
throws TransformerException, ParserConfigurationException, SAXException, IOException {
- FilenameFilter directoryFilter = new FilenameFilter() {
+ FilenameFilter directoryFilter = new DirectoryFilter();
- public boolean accept(File dir, String name) {
- File _file = new File(dir, name);
- return _file.isDirectory();
- }
- };
-
- FilenameFilter xmlFileFilter = new FilenameFilter() {
-
- public boolean accept(File dir, String name) {
- File _file = new File(dir, name);
- return _file.isFile() && FileUtil.getExtension(name).equals("xml");
- }
- };
+ FilenameFilter xmlFileFilter = new XMLFilenameFilter();
log("root file: " + file.getCanonicalPath());
assert(file.isDirectory());
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/HTMLFormSaveAction.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/HTMLFormSaveAction.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/HTMLFormSaveAction.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/HTMLFormSaveAction.java Tue Feb 8 13:05:13 2005
@@ -84,7 +84,7 @@
*/
public class HTMLFormSaveAction extends AbstractConfigurableAction implements ThreadSafe {
- class XUpdateAttributes {
+ private static final class XUpdateAttributes {
/**
* <code>xupdateAttrExpr</code> The Xupdate expression
*/
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java Tue Feb 8 13:05:13 2005
@@ -20,6 +20,7 @@
import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -40,9 +41,11 @@
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentIdentityMap;
import org.apache.lenya.cms.publication.PageEnvelope;
+import org.apache.lenya.cms.publication.PageEnvelopeException;
import org.apache.lenya.cms.publication.PageEnvelopeFactory;
import org.apache.lenya.cms.publication.Proxy;
import org.apache.lenya.cms.publication.Publication;
+import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.PublicationFactory;
import org.apache.lenya.util.ServletHelper;
import org.xml.sax.Attributes;
@@ -100,11 +103,13 @@
PageEnvelope envelope = PageEnvelopeFactory.getInstance().getPageEnvelope(
this.identityMap, _objectModel);
this.currentDocument = envelope.getDocument();
-
- } catch (Exception e) {
- throw new ProcessingException(e);
+ } catch (final PublicationException e1) {
+ throw new ProcessingException(e1);
+ } catch (final PageEnvelopeException e1) {
+ throw new ProcessingException(e1);
}
+
if (getLogger().isDebugEnabled()) {
getLogger().debug("Setting up transformer");
getLogger().debug(" Processed version: [" + getCurrentDocument() + "]");
@@ -141,7 +146,9 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug(" Using policy manager [" + this.policyManager + "]");
}
- } catch (Exception e) {
+ } catch (final ServiceException e) {
+ throw new ProcessingException(e);
+ } catch (final AccessControlException e) {
throw new ProcessingException(e);
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultResourcesManager.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultResourcesManager.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultResourcesManager.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultResourcesManager.java Tue Feb 8 13:05:13 2005
@@ -29,6 +29,7 @@
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
@@ -44,6 +45,53 @@
*/
public class DefaultResourcesManager extends AbstractLogEnabled implements ResourcesManager {
+ private static final class MetaSuffixFileFilter implements FileFilter {
+ /**
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File file) {
+ return file.isFile() && file.getName().endsWith(RESOURCES_META_SUFFIX);
+ }
+ }
+
+ private static final class NotMetaSuffixFileFilter implements FileFilter {
+ /**
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File file) {
+ return file.isFile() && !file.getName().endsWith(RESOURCES_META_SUFFIX);
+ }
+ }
+
+ private static final class ImageExtensionsFileFilter implements FileFilter {
+ /**
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File file) {
+ for (int i = 0; i < IMAGE_FILE_EXTENSIONS.length; i++)
+ if (file.getName().toLowerCase(Locale.ENGLISH).endsWith(IMAGE_FILE_EXTENSIONS[i]))
+ return true;
+ return false;
+ }
+ }
+
+ private static final class ResourceMetaFileFilter implements FileFilter {
+ private final File resource;
+
+ private ResourceMetaFileFilter(File _resource) {
+ super();
+ this.resource = _resource;
+ }
+
+ /**
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File file) {
+ return file.isFile()
+ && file.getName().equals(this.resource.getName().concat(RESOURCES_META_SUFFIX));
+ }
+ }
+
private Document document = null;
private DublinCoreImpl dc = null;
@@ -208,12 +256,7 @@
public File[] getResources() {
// filter the meta files out. We only want to see the "real" resources.
- FileFilter filter = new FileFilter() {
-
- public boolean accept(File file) {
- return file.isFile() && !file.getName().endsWith(RESOURCES_META_SUFFIX);
- }
- };
+ FileFilter filter = new NotMetaSuffixFileFilter();
return getFiles(filter);
}
@@ -223,14 +266,7 @@
* @return All image resources.
*/
public File[] getImageResources() {
- return getFiles(new FileFilter() {
- public boolean accept(File file) {
- for (int i = 0; i < IMAGE_FILE_EXTENSIONS.length; i++)
- if (file.getName().toLowerCase().endsWith(IMAGE_FILE_EXTENSIONS[i]))
- return true;
- return false;
- }
- });
+ return getFiles(new ImageExtensionsFileFilter());
}
/**
@@ -253,12 +289,7 @@
* document.
*/
public File[] getMetaFiles() {
- FileFilter filter = new FileFilter() {
-
- public boolean accept(File file) {
- return file.isFile() && file.getName().endsWith(RESOURCES_META_SUFFIX);
- }
- };
+ FileFilter filter = new MetaSuffixFileFilter();
return getFiles(filter);
}
@@ -273,12 +304,7 @@
if (resource.getName().endsWith(RESOURCES_META_SUFFIX))
throw new IllegalArgumentException("File is itself a meta file.");
- final FileFilter filter = new FileFilter() {
- public boolean accept(File file) {
- return file.isFile()
- && file.getName().equals(resource.getName().concat(RESOURCES_META_SUFFIX));
- }
- };
+ final FileFilter filter = new ResourceMetaFileFilter(resource);
final File[] metaFiles = getFiles(filter);
assert (metaFiles.length == 0);
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publishing/StaticHTMLExporter.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publishing/StaticHTMLExporter.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publishing/StaticHTMLExporter.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publishing/StaticHTMLExporter.java Tue Feb 8 13:05:13 2005
@@ -20,6 +20,7 @@
package org.apache.lenya.cms.publishing;
import java.io.File;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.StringTokenizer;
@@ -83,7 +84,9 @@
wget.download(uri, substituteExpression, substituteReplacement);
}
- } catch (Exception e) {
+ } catch (final MalformedURLException e) {
+ throw new ExportException(e);
+ } catch (final IOException e) {
throw new ExportException(e);
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/rc/RCEnvironment.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/rc/RCEnvironment.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/rc/RCEnvironment.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/rc/RCEnvironment.java Tue Feb 8 13:05:13 2005
@@ -20,6 +20,7 @@
package org.apache.lenya.cms.rc;
import java.io.File;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -28,6 +29,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.log4j.Logger;
+import org.xml.sax.SAXException;
/**
* Helper class that holds the revision controller configuration
@@ -82,7 +84,11 @@
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
Configuration configuration = builder.buildFromFile(configurationFile);
configure(configuration);
- } catch (Exception e) {
+ } catch (final ConfigurationException e) {
+ log.error("Cannot load revision controller configuration! ", e);
+ } catch (final SAXException e) {
+ log.error("Cannot load revision controller configuration! ", e);
+ } catch (final IOException e) {
log.error("Cannot load revision controller configuration! ", e);
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java Tue Feb 8 13:05:13 2005
@@ -59,6 +59,15 @@
* A simple servlet that starts an instance of a Quartz scheduler.
*/
public class LoadQuartzServlet extends HttpServlet {
+ private static final class IsDirectoryFileFilter implements FileFilter {
+ /**
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File file) {
+ return file.isDirectory();
+ }
+ }
+
private static Logger log = Logger.getLogger(LoadQuartzServlet.class);
private static SchedulerWrapper scheduler = null;
private ServletContext servletContext;
@@ -387,11 +396,7 @@
File publicationsDirectory = new File(getServletContextDirectory(),
PublishingEnvironment.PUBLICATION_PREFIX);
- File[] publicationDirectories = publicationsDirectory.listFiles(new FileFilter() {
- public boolean accept(File file) {
- return file.isDirectory();
- }
- });
+ File[] publicationDirectories = publicationsDirectory.listFiles(new IsDirectoryFileFilter());
log.debug("=========================================");
log.debug(" Restoring jobs.");
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java Tue Feb 8 13:05:13 2005
@@ -51,8 +51,8 @@
* may need to take special areas into acccount, such as info-authoring */
protected void doInitialize() {
super.doInitialize();
- this.doc = getSourceDocument();
try {
+ this.doc = getSourceDocument();
if (hasWorkflow(getSourceDocument())) {
this.instance = getWorkflowInstance(getSourceDocument());
setParameter(STATE, this.instance.getCurrentState().toString());
@@ -63,7 +63,7 @@
} else {
setParameter("state", "");
}
- } catch (final WorkflowException e) {
+ } catch (WorkflowException e) {
getLogger().error("Could not get workflow state.");
addErrorMessage("Could not get workflow state.");
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java Tue Feb 8 13:05:13 2005
@@ -19,6 +19,7 @@
package org.apache.lenya.cms.task;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -28,6 +29,8 @@
import java.util.Map;
import java.util.Properties;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.Request;
import org.apache.lenya.ac.Identity;
@@ -37,6 +40,7 @@
import org.apache.lenya.xml.NamespaceHelper;
import org.apache.log4j.Logger;
import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
/**
* The default task wrapper
@@ -236,8 +240,16 @@
Parameters _parameters = Parameters.fromProperties(properties);
task.parameterize(_parameters);
- } catch (Exception e) {
+ } catch (final ConfigurationException e) {
throw new ExecutionException(e);
+ } catch (final ParameterException e) {
+ throw new ExecutionException(e);
+ } catch (final SAXException e) {
+ throw new ExecutionException(e);
+ } catch (final IOException e) {
+ throw new ExecutionException(e);
+ } catch (ExecutionException e) {
+ throw e;
}
log.debug("-----------------------------------");
Modified: lenya/trunk/src/java/org/apache/lenya/search/crawler/HTMLHandler.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/search/crawler/HTMLHandler.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/search/crawler/HTMLHandler.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/search/crawler/HTMLHandler.java Tue Feb 8 13:05:13 2005
@@ -20,6 +20,7 @@
package org.apache.lenya.search.crawler;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.text.ParseException;
@@ -335,9 +336,8 @@
public void parse(InputStream in) {
try {
reset();
-
pd.parse(new BufferedReader(new InputStreamReader(in)), this, true);
- } catch (Exception e) {
+ } catch (final IOException e) {
e.printStackTrace();
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/search/crawler/IterativeHTMLCrawler.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/search/crawler/IterativeHTMLCrawler.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/search/crawler/IterativeHTMLCrawler.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/search/crawler/IterativeHTMLCrawler.java Tue Feb 8 13:05:13 2005
@@ -39,6 +39,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.log4j.Logger;
+import org.xml.sax.SAXException;
/**
@@ -78,7 +79,11 @@
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
Configuration configuration = builder.buildFromFile(this.configurationFilePath);
configure(configuration);
- } catch (Exception e) {
+ } catch (final ConfigurationException e1) {
+ System.err.println("Cannot load crawler configuration!");
+ } catch (final SAXException e1) {
+ System.err.println("Cannot load crawler configuration!");
+ } catch (final IOException e1) {
System.err.println("Cannot load crawler configuration!");
}
new IterativeHTMLCrawler(new File(args[0])).crawl(new URL(this.baseURL), this.scopeURL[0]);
@@ -128,8 +133,12 @@
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
Configuration configuration = builder.buildFromFile(config);
configure(configuration);
- } catch (Exception e) {
- System.err.println("Cannot load crawler configuration! ");
+ } catch (final ConfigurationException e) {
+ System.err.println("Cannot load crawler configuration! " + e.toString());
+ } catch (final SAXException e) {
+ System.err.println("Cannot load crawler configuration! " + e.toString());
+ } catch (final IOException e) {
+ System.err.println("Cannot load crawler configuration! " + e.toString());
}
this.robot = new RobotExclusion(this.userAgent);
Modified: lenya/trunk/src/java/org/apache/lenya/util/HTML.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/util/HTML.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/util/HTML.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/util/HTML.java Tue Feb 8 13:05:13 2005
@@ -88,8 +88,8 @@
while (link_href_iterator.hasNext()) {
System.out.println((String) link_href_iterator.next());
}
- } catch (Exception e) {
- System.err.println(".main(): " + e);
+ } catch (final IOException e) {
+ System.err.println("IO error : " + e);
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/util/TidyCommandLine.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/util/TidyCommandLine.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/util/TidyCommandLine.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/util/TidyCommandLine.java Tue Feb 8 13:05:13 2005
@@ -21,9 +21,12 @@
import java.io.BufferedInputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileWriter;
+import java.io.IOException;
import java.io.PrintWriter;
+import java.net.MalformedURLException;
import java.net.URL;
import org.w3c.tidy.Tidy;
@@ -44,9 +47,11 @@
}
try {
- new TidyCommandLine().tidy(new URL(args[0]), new File(args[1]), new File(args[2]), true);
- } catch (Exception e) {
- System.err.println(e);
+ new TidyCommandLine().tidy(new URL(args[0]), new File(args[1]), new File(args[2]), true);
+ } catch (final MalformedURLException e) {
+ System.err.println("Malformed URL: " +e.toString());
+ } catch (final IOException e) {
+ System.err.println("IO error: " +e.toString());
}
}
@@ -56,16 +61,23 @@
* @param file The file
* @param err The file to hold error messages
* @param xhtml Whether to produce XHTML
- * @throws Exception if an error occurs
+ * @throws IOException if an error occurs
*/
- public void tidy(URL url, File file, File err, boolean xhtml)
- throws Exception {
- Tidy tidy = new Tidy();
- tidy.setXmlOut(xhtml);
- tidy.setErrout(new PrintWriter(new FileWriter(err.getAbsolutePath()), true));
-
- BufferedInputStream in = new BufferedInputStream(url.openStream());
- FileOutputStream out = new FileOutputStream(file.getAbsolutePath());
- tidy.parse(in, out);
+ public void tidy(URL url, File file, File err, boolean xhtml) throws IOException {
+ try {
+ Tidy tidy = new Tidy();
+ tidy.setXmlOut(xhtml);
+ tidy.setErrout(new PrintWriter(new FileWriter(err.getAbsolutePath()), true));
+
+ BufferedInputStream in = new BufferedInputStream(url.openStream());
+ FileOutputStream out = new FileOutputStream(file.getAbsolutePath());
+ tidy.parse(in, out);
+ } catch (final FileNotFoundException e) {
+ System.err.println("File not found " +e.toString());
+ throw new IOException(e.toString());
+ } catch (final IOException e) {
+ System.err.println("IO error " +e.toString());
+ throw e;
+ }
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/workflow/impl/HistoryImpl.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/workflow/impl/HistoryImpl.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/workflow/impl/HistoryImpl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/workflow/impl/HistoryImpl.java Tue Feb 8 13:05:13 2005
@@ -124,17 +124,17 @@
historyElement.appendChild(initialVersionElement);
DocumentHelper.writeDocument(helper.getDocument(), file);
- } catch (DOMException e) {
+ } catch (final DOMException e) {
throw new WorkflowException(e);
- } catch (TransformerConfigurationException e) {
+ } catch (final TransformerConfigurationException e) {
throw new WorkflowException(e);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new WorkflowException(e);
- } catch (ParserConfigurationException e) {
+ } catch (final ParserConfigurationException e) {
throw new WorkflowException(e);
- } catch (WorkflowException e) {
+ } catch (final WorkflowException e) {
throw new WorkflowException(e);
- } catch (TransformerException e) {
+ } catch (final TransformerException e) {
throw new WorkflowException(e);
}
}
Modified: lenya/trunk/src/test/org/apache/lenya/cms/task/AntTaskTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/task/AntTaskTest.java?view=diff&r1=152936&r2=152937
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/task/AntTaskTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/task/AntTaskTest.java Tue Feb 8 13:05:13 2005
@@ -46,11 +46,27 @@
* Override {@link #evaluateTest()} to add your evaluation code.
*/
public class AntTaskTest extends TestCase {
+
+ private static final class LastModifiedFilter implements FileFilter {
+ private final GregorianCalendar beforeExecution;
+
+ private LastModifiedFilter(GregorianCalendar _beforeExecution) {
+ super();
+ this.beforeExecution = _beforeExecution;
+ }
+
+ /**
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File file) {
+ return file.lastModified() > this.beforeExecution.getTimeInMillis();
+ }
+ }
+
private static String target = "test";
/**
* Creates a new AntTaskTest object.
- *
* @param test the test
*/
public AntTaskTest(String test) {
@@ -82,7 +98,6 @@
/**
* Creates a test suite.
- *
* @return the test suite
*/
public static Test getSuite() {
@@ -92,7 +107,6 @@
/**
* Tests the AntTask class.
* Template method, please override {@link #evaluateTest()} and {@link #getTarget()} and {@link #prepareTest()}.
- *
* @throws Exception if an error occurs
*/
public final void testAntTask() throws Exception {
@@ -112,7 +126,6 @@
/**
* Tests an AntTask.
* @param _target the target of the task to test.
- *
* @throws ExecutionException if an error occurs
* @throws IOException if an error occurs
* @throws ParameterException if an error occurs
@@ -140,11 +153,7 @@
task.execute(publication.getServletContext().getCanonicalPath());
File logDirectory = new File(publication.getDirectory(), AntTask.LOG_PATH);
- File[] logFiles = logDirectory.listFiles(new FileFilter() {
- public boolean accept(File file) {
- return file.lastModified() > beforeExecution.getTimeInMillis();
- }
- });
+ File[] logFiles = logDirectory.listFiles(new LastModifiedFilter(beforeExecution));
assertTrue(logFiles.length == 1);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org