Return-Path: Delivered-To: apmail-cocoon-lenya-cvs-archive@cocoon.apache.org Received: (qmail 58750 invoked by uid 500); 30 May 2003 09:25:31 -0000 Mailing-List: contact lenya-cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: "Lenya CVS Mailing List" Delivered-To: mailing list lenya-cvs@cocoon.apache.org Received: (qmail 58737 invoked from network); 30 May 2003 09:25:31 -0000 Date: 30 May 2003 09:25:44 -0000 Message-ID: <20030530092544.7639.qmail@icarus.apache.org> From: egli@apache.org To: cocoon-lenya-cvs@apache.org Subject: cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting XopusHandlerAction.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N egli 2003/05/30 02:25:44 Modified: src/java/org/apache/lenya/cms/cocoon/acting XopusHandlerAction.java Log: Replace deprecated usage of org.apache.cocoon.environment.Source by org.apache.excalibur.source.Source Revision Changes Path 1.31 +4 -10 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/XopusHandlerAction.java Index: XopusHandlerAction.java =================================================================== RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/XopusHandlerAction.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- XopusHandlerAction.java 2 May 2003 15:32:20 -0000 1.30 +++ XopusHandlerAction.java 30 May 2003 09:25:44 -0000 1.31 @@ -45,24 +45,21 @@ import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.framework.component.ComponentException; -import org.apache.avalon.framework.component.ComponentSelector; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.acting.ConfigurableComposerAction; +import org.apache.excalibur.source.Source; import org.apache.excalibur.xml.dom.DOMParser; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Session; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.environment.http.HttpRequest; -import org.apache.cocoon.serialization.Serializer; import org.apache.cocoon.util.IOUtils; import org.apache.cocoon.util.PostInputStream; -import org.apache.cocoon.xml.dom.DOMStreamer; - import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -77,9 +74,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStream; - -import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -149,8 +143,8 @@ String source, Parameters params) throws IOException, ComponentException, SAXException, ProcessingException { // Get absolute path of sitemap directory - org.apache.cocoon.environment.Source input_source = resolver.resolve(""); - String sitemapPath = input_source.getSystemId(); + Source input_source = resolver.resolveURI(""); + String sitemapPath = input_source.getURI(); sitemapPath = sitemapPath.substring(5); // Remove "file:" protocol getLogger().debug(".act(): Absolute Sitemap Directory: " + sitemapPath); getLogger().debug(".act(): Absolute XML Root Directory: " + sitemapPath + xmlRoot); --------------------------------------------------------------------- To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org