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 2006/12/25 23:31:30 UTC

svn commit: r490194 - in /cocoon/trunk/core/cocoon-xml: cocoon-xml-impl/ cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/ cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/

Author: cziegeler
Date: Mon Dec 25 14:31:30 2006
New Revision: 490194

URL: http://svn.apache.org/viewvc?view=rev&rev=490194
Log:
Fix bugs

Modified:
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml?view=diff&rev=490194&r1=490193&r2=490194
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml Mon Dec 25 14:31:30 2006
@@ -40,7 +40,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
+      <artifactId>spring-context</artifactId>
       <version>2.0.1</version>
     </dependency>   
     <dependency>

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java?view=diff&rev=490194&r1=490193&r2=490194
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java Mon Dec 25 14:31:30 2006
@@ -125,7 +125,7 @@
      * parameters that may have been specified in cocoon.xconf
      * @param params The configuration information
      */
-    protected void init()
+    public void init()
     throws Exception { 
         // Over-ride debug level that is set by CatalogManager.properties
         if ( this.verbosity != null ) {

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java?view=diff&rev=490194&r1=490193&r2=490194
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java Mon Dec 25 14:31:30 2006
@@ -39,7 +39,7 @@
     /**
      * @see org.apache.cocoon.core.xml.impl.DefaultEntityResolver#init()
      */
-    protected void init()
+    public void init()
     throws Exception {
         // create temporary directory for our entities
         final File workDirectory = new File(settings.getWorkDirectory());