You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/05/03 21:59:31 UTC
svn commit: r534979 - in
/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main:
java/org/apache/cocoon/servletservice/postable/components/
resources/META-INF/cocoon/spring/
Author: gkossakowski
Date: Thu May 3 12:59:30 2007
New Revision: 534979
URL: http://svn.apache.org/viewvc?view=rev&rev=534979
Log:
Second attempt to use org.apache.cocoon.core.xml.SAXParser instead of org.apache.excalibur.xml.sax.SAXParser.
See this discussion: http://thread.gmane.org/gmane.text.xml.cocoon.devel/72927
Modified:
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-generator.xml
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java?view=diff&rev=534979&r1=534978&r2=534979
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java Thu May 3 12:59:30 2007
@@ -32,7 +32,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.xml.sax.SAXParser;
+import org.apache.cocoon.core.xml.SAXParser;
import org.xml.sax.SAXException;
/**
@@ -86,9 +86,9 @@
throw SourceUtil.handle("Error during resolving of '" + src + "'.", se);
}
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("Source " + service + " resolved to " + servletSource.getURI());
- getLogger().debug("Source " + super.source + " resolved to " + inputSource.getURI());
+ if (logger.isDebugEnabled()) {
+ logger.debug("Source " + service + " resolved to " + servletSource.getURI());
+ logger.debug("Source " + super.source + " resolved to " + inputSource.getURI());
}
IOUtils.copy(inputSource.getInputStream(), servletSource.getOutputStream());
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-generator.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-generator.xml?view=diff&rev=534979&r1=534978&r2=534979
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-generator.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-generator.xml Thu May 3 12:59:30 2007
@@ -20,8 +20,8 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean name="org.apache.cocoon.generation.Generator/servletService"
- class="org.apache.cocoon.servletservice.postable.components.ServletServiceGenerator" init-method="init">
- <property name="saxParser" ref="org.apache.excalibur.xml.sax.SAXParser"/>
+ class="org.apache.cocoon.servletservice.postable.components.ServletServiceGenerator" init-method="init" scope="prototype">
+ <property name="saxParser" ref="org.apache.cocoon.core.xml.SAXParser"/>
</bean>
</beans>