Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 30140 invoked by uid 500); 26 Jan 2002 02:16:50 -0000 Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: cocoon-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cocoon-cvs@xml.apache.org Received: (qmail 30131 invoked by uid 500); 26 Jan 2002 02:16:50 -0000 Delivered-To: apmail-xml-cocoon2-cvs@apache.org Date: 26 Jan 2002 02:16:49 -0000 Message-ID: <20020126021649.88989.qmail@icarus.apache.org> From: vgritsenko@apache.org To: xml-cocoon2-cvs@apache.org Subject: cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/xslt XSLTProcessorImpl.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N vgritsenko 02/01/25 18:16:49 Modified: src/java/org/apache/cocoon/generation ServerPagesGenerator.java src/java/org/apache/cocoon/components/xslt XSLTProcessorImpl.java Log: ResourceNotFoundException abuse Revision Changes Path 1.4 +7 -8 xml-cocoon2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java Index: ServerPagesGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ServerPagesGenerator.java 25 Jan 2002 03:48:30 -0000 1.3 +++ ServerPagesGenerator.java 26 Jan 2002 02:16:49 -0000 1.4 @@ -59,7 +59,7 @@ * * @author Ricardo Rocha * @author Sylvain Wallez - * @version CVS $Revision: 1.3 $ $Date: 2002/01/25 03:48:30 $ + * @version CVS $Revision: 1.4 $ $Date: 2002/01/26 02:16:49 $ */ public class ServerPagesGenerator extends ServletGenerator implements Recyclable, Disposable, Cacheable, Configurable @@ -152,12 +152,11 @@ * The default ProgrammingLanguage */ public final static String DEFAULT_PROGRAMMING_LANGUAGE = "java"; - + public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par) throws ProcessingException, SAXException, IOException { super.setup(resolver, objectModel, src, par); - this.inputSource = this.resolver.resolve(super.source); if (this.markupLanguage == null) { @@ -176,7 +175,7 @@ throw e; } catch (Exception e) { getLogger().warn("ServerPagesGenerator.generate()", e); - throw new ResourceNotFoundException(e.getMessage(), e); + throw new ProcessingException(e.getMessage(), e); } catch (NoClassDefFoundError e) { getLogger().warn("Failed to load class: " + e); throw new ResourceNotFoundException(e.getMessage()); @@ -228,16 +227,16 @@ try { generator.generate(); } catch (IOException e){ - getLogger().error("IOException in ServerPagesGenerator.generate()", e); + getLogger().debug("IOException in generate()", e); throw e; } catch (SAXException e){ - getLogger().error("SAXException in ServerPagesGenerator.generate()", e); + getLogger().debug("SAXException in generate()", e); throw e; } catch (ProcessingException e){ - getLogger().error("ProcessingException in ServerPagesGenerator.generate()", e); + getLogger().debug("ProcessingException in generate()", e); throw e; } catch (Exception e){ - getLogger().error("Exception in ServerPagesGenerator.generate()", e); + getLogger().debug("Exception in generate()", e); throw new ProcessingException("Exception in ServerPagesGenerator.generate()", e); } finally { if(generator != null) 1.8 +3 -4 xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java Index: XSLTProcessorImpl.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- XSLTProcessorImpl.java 25 Jan 2002 21:06:36 -0000 1.7 +++ XSLTProcessorImpl.java 26 Jan 2002 02:16:49 -0000 1.8 @@ -100,8 +100,7 @@ SourceResolver resolver; /** - * Compose. - * Try to get the store and the entity resolver (optional) + * Compose. Try to get the store */ public void compose(ComponentManager manager) throws ComponentException { @@ -196,8 +195,8 @@ TransformerHandler handler = getTransformerFactory().newTransformerHandler(templates); - - /* (VG) + + /* (VG) From http://java.sun.com/j2se/1.4/docs/api/javax/xml/transform/TransformerFactory.html#newTemplates(javax.xml.transform.Source) Or http://xml.apache.org/xalan-j/apidocs/javax/xml/transform/TransformerFactory.html#newTemplates(javax.xml.transform.Source) ---------------------------------------------------------------------- In case of troubles, e-mail: webmaster@xml.apache.org To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org For additional commands, e-mail: cocoon-cvs-help@xml.apache.org