You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2005/12/12 10:16:08 UTC
svn commit: r356228 - in /cocoon:
blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/
blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/
trunk/legal/ trunk/lib/ trunk/lib/core/ trunk/lib/optional/ trunk/src/java...
Author: antonio
Date: Mon Dec 12 01:15:52 2005
New Revision: 356228
URL: http://svn.apache.org/viewcvs?rev=356228&view=rev
Log:
Replace deprecated library excalibur-io 1.1 with commons-io 1.1.
Added:
cocoon/trunk/legal/commons-io-1.1.jar.license.txt
- copied unchanged from r356215, cocoon/trunk/legal/commons-digester-1.7.jar.license.txt
cocoon/trunk/lib/core/commons-io-1.1.jar (with props)
Removed:
cocoon/trunk/legal/excalibur-io-1.1.jar.license.txt
cocoon/trunk/lib/core/excalibur-io-1.1.jar
cocoon/trunk/lib/optional/commons-io-1.0.jar
Modified:
cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
cocoon/trunk/lib/jars.xml
cocoon/trunk/src/java/Manifest.mf
cocoon/trunk/src/java/org/apache/cocoon/components/flow/util/PipelineUtil.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/Part.java
Modified: cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java?rev=356228&r1=356227&r2=356228&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java (original)
+++ cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java Mon Dec 12 01:15:52 2005
@@ -29,7 +29,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.parameters.ParameterException;
@@ -63,6 +62,7 @@
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.cocoon.servlet.multipart.PartOnDisk;
import org.apache.cocoon.util.ClassUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
@@ -208,7 +208,7 @@
if ( o != null && o instanceof Part) {
final Part file = (Part)o;
try {
- byte[] c = IOUtil.toByteArray(file.getInputStream());
+ byte[] c = IOUtils.toByteArray(file.getInputStream());
ContentItem ci = new ContentItem(file.getFileName(), true);
ci.setContent(c);
store.addItem(ci);
@@ -248,7 +248,7 @@
source = resolver.resolveURI(url);
CopletData copletData = this.portalService.getComponentManager().getProfileManager().getCopletData(event.getCopletDataId());
cid = this.portalService.getComponentManager().getCopletFactory().newInstance(copletData);
- cid.setAttribute("item-content", IOUtil.toByteArray(source.getInputStream()));
+ cid.setAttribute("item-content", IOUtils.toByteArray(source.getInputStream()));
} catch (IOException se) {
this.getLogger().warn("Unable to get content for " + url, se);
} catch (ServiceException se) {
@@ -377,7 +377,7 @@
ci.setAttribute("coplet-attributes", attributes);
}
source = resolver.resolveURI(url);
- ci.setContent(IOUtil.toByteArray(source.getInputStream()));
+ ci.setContent(IOUtils.toByteArray(source.getInputStream()));
} catch (IOException se) {
this.getLogger().warn("Unable to get content for " + url, se);
} catch (ServiceException se) {
Modified: cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java?rev=356228&r1=356227&r2=356228&view=diff
==============================================================================
--- cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java (original)
+++ cocoon/blocks/webdav/trunk/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java Mon Dec 12 01:15:52 2005
@@ -23,7 +23,6 @@
import javax.xml.transform.OutputKeys;
-import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
@@ -43,6 +42,7 @@
import org.apache.cocoon.components.webdav.WebDAVUtil;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.io.IOUtils;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.xml.dom.DOMParser;
import org.apache.webdav.lib.WebdavResource;
@@ -132,7 +132,7 @@
public String getContentString(String uri) throws ProcessingException {
try {
- return IOUtil.toString(this.getContentStream(uri));
+ return IOUtils.toString(this.getContentStream(uri));
} catch (IOException ioe) {
throw new ProcessingException ("Error loading resource: " + this.repoBaseUrl + uri, ioe);
@@ -231,7 +231,7 @@
public boolean saveContent(String uri, Source source) {
try {
- return this.saveContent(uri, IOUtil.toString(source.getInputStream()));
+ return this.saveContent(uri, IOUtils.toString(source.getInputStream()));
} catch (IOException ioe) {
this.getLogger().error("Error saving source: " + source.getURI() +
Added: cocoon/trunk/lib/core/commons-io-1.1.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/core/commons-io-1.1.jar?rev=356228&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/core/commons-io-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: cocoon/trunk/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/jars.xml?rev=356228&r1=356227&r2=356228&view=diff
==============================================================================
--- cocoon/trunk/lib/jars.xml (original)
+++ cocoon/trunk/lib/jars.xml Mon Dec 12 01:15:52 2005
@@ -79,17 +79,6 @@
<homepage>http://excalibur.apache.org/</homepage>
</file>
- <file id="excalibur-io">
- <title>Excalibur IO</title>
- <description>
- Part of Excalibur, it is a set of classes and patterns that
- support high level server development.
- </description>
- <used-by>Cocoon</used-by>
- <lib>core/excalibur-io-1.1.jar</lib>
- <homepage>http://excalibur.apache.org/</homepage>
- </file>
-
<file id="excalibur-logger">
<title>Excalibur Logger</title>
<description>
@@ -208,6 +197,16 @@
<homepage>http://jakarta.apache.org/commons/collections/</homepage>
</file>
+ <file>
+ <title>Jakarta Commons IO</title>
+ <description>
+ Commons IO is a library of utilities to assist with developing IO functionality.
+ </description>
+ <used-by>Cocoon,jci</used-by>
+ <lib>core/commons-io-1.1.jar</lib>
+ <homepage>http://jakarta.apache.org/commons/io/</homepage>
+ </file>
+
<file id="jakarta-regexp">
<title>Jakarta Regexp</title>
<description>
@@ -1159,15 +1158,6 @@
<used-by>javaflow</used-by>
<lib>core/commons-javaflow-r306555.jar</lib>
<homepage></homepage>
- </file>
-
- <file id="commons-io">
- <title>Jakarta Commons IO</title>
- <description>
- </description>
- <used-by>jci</used-by>
- <lib>optional/commons-io-1.0.jar</lib>
- <homepage>http://jakarta.apache.org/commons/io/</homepage>
</file>
<file>
Modified: cocoon/trunk/src/java/Manifest.mf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/Manifest.mf?rev=356228&r1=356227&r2=356228&view=diff
==============================================================================
--- cocoon/trunk/src/java/Manifest.mf (original)
+++ cocoon/trunk/src/java/Manifest.mf Mon Dec 12 01:15:52 2005
@@ -18,6 +18,7 @@
commons-cli-1.0.jar,
commons-collections-3.1.jar,
commons-httpclient-2.0.2.jar,
+ commons-io-1.1.jar,
commons-javaflow-r306555.jar,
commons-jci-r306555.jar,
commons-jexl-1.0.jar,
@@ -28,7 +29,6 @@
ehcache-1.1.jar,
excalibur-i18n-1.1.jar,
excalibur-instrument-api-2.1.jar,
- excalibur-io-1.1.jar,
excalibur-logger-2.1.jar,
excalibur-naming-1.0.jar,
excalibur-pool-api-2.1.jar,
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/util/PipelineUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/util/PipelineUtil.java?rev=356228&r1=356227&r2=356228&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/util/PipelineUtil.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/util/PipelineUtil.java Mon Dec 12 01:15:52 2005
@@ -20,7 +20,6 @@
import java.io.OutputStream;
import java.util.Map;
-import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
@@ -32,6 +31,7 @@
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.components.flow.FlowHelper;
import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.commons.io.IOUtils;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.w3c.dom.Document;
@@ -108,7 +108,7 @@
try {
src = this.resolver.resolveURI("cocoon:/" + uri);
input = src.getInputStream();
- IOUtil.copy(input, output);
+ IOUtils.copy(input, output);
} finally {
if (input != null) {
try {
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/Part.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/Part.java?rev=356228&r1=356227&r2=356228&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/Part.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/multipart/Part.java Mon Dec 12 01:15:52 2005
@@ -21,8 +21,8 @@
import java.io.OutputStream;
import java.util.Map;
-import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.commons.io.IOUtils;
import org.apache.excalibur.source.ModifiableSource;
@@ -125,7 +125,7 @@
public void copyToSource(ModifiableSource source) throws IOException {
InputStream is = getInputStream();
OutputStream os = source.getOutputStream();
- IOUtil.copy(is, os);
+ IOUtils.copy(is, os);
is.close();
os.close();
}
@@ -140,7 +140,7 @@
public void copyToFile(String filename) throws IOException {
InputStream is = getInputStream();
OutputStream os = new FileOutputStream(filename);
- IOUtil.copy(is, os);
+ IOUtils.copy(is, os);
is.close();
os.close();
}