You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/02/17 03:47:50 UTC
svn commit: r508699 - in /incubator/tuscany/java/sca/kernel/core: ./
src/main/java/org/apache/tuscany/core/services/deployment/
src/main/java/org/apache/tuscany/core/util/
Author: lresende
Date: Fri Feb 16 18:47:49 2007
New Revision: 508699
URL: http://svn.apache.org/viewvc?view=rev&rev=508699
Log:
Removing commons-io dependecy - merge from sca-java-integration branch revision #508670
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java
- copied unchanged from r508670, incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java
- copied unchanged from r508670, incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java
Modified:
incubator/tuscany/java/sca/kernel/core/pom.xml
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionRepositoryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java
Modified: incubator/tuscany/java/sca/kernel/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/pom.xml?view=diff&rev=508699&r1=508698&r2=508699
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/pom.xml (original)
+++ incubator/tuscany/java/sca/kernel/core/pom.xml Fri Feb 16 18:47:49 2007
@@ -72,12 +72,6 @@
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImpl.java?view=diff&rev=508699&r1=508698&r2=508699
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImpl.java Fri Feb 16 18:47:49 2007
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.io.FilenameUtils;
+import org.apache.tuscany.core.util.FileHelper;
import org.apache.tuscany.spi.deployer.ContentTypeDescriber;
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Service;
@@ -55,7 +55,7 @@
}
protected String resolveContentyTypeByExtension(URL resourceURL) {
- String artifactExtension = FilenameUtils.getExtension(resourceURL.getPath());
+ String artifactExtension = FileHelper.getExtension(resourceURL.getPath());
if (artifactExtension == null) {
return null;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionRepositoryImpl.java?view=diff&rev=508699&r1=508698&r2=508699
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionRepositoryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionRepositoryImpl.java Fri Feb 16 18:47:49 2007
@@ -32,9 +32,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOUtils;
+import org.apache.tuscany.core.util.FileHelper;
+import org.apache.tuscany.core.util.IOHelper;
import org.apache.tuscany.spi.deployer.ContributionRepository;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.EagerInit;
@@ -58,7 +57,7 @@
*/
public ContributionRepositoryImpl(@Property(name = "repository") String repository) throws IOException {
this.rootFile = new File(repository);
- FileUtils.forceMkdir(rootFile);
+ FileHelper.forceMkdir(rootFile);
if (!rootFile.exists() || !rootFile.isDirectory() || !rootFile.canRead()) {
throw new IOException("The root is not a directory: " + repository);
}
@@ -73,7 +72,7 @@
*/
private File mapToFile(URI contribution) {
// FIXME: Map the contribution URI to a file?
- return new File(rootFile, FilenameUtils.getName(contribution.toString()));
+ return new File(rootFile, FileHelper.getName(contribution.toString()));
}
/**
@@ -90,10 +89,10 @@
try {
out = new BufferedOutputStream(new FileOutputStream(target));
in = new BufferedInputStream(source);
- IOUtils.copy(in, out);
+ IOHelper.copy(in, out);
} finally {
- IOUtils.closeQuietly(out);
- IOUtils.closeQuietly(in);
+ IOHelper.closeQuietly(out);
+ IOHelper.closeQuietly(in);
}
}
@@ -122,7 +121,7 @@
if (contributionURL != null) {
// remove
try {
- FileUtils.forceDelete(FileUtils.toFile(contributionURL));
+ FileHelper.forceDelete(FileHelper.toFile(contributionURL));
this.reposirotyContent.remove(contribution);
} catch (IOException ioe) {
// handle file could not be removed
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java?view=diff&rev=508699&r1=508698&r2=508699
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java Fri Feb 16 18:47:49 2007
@@ -25,7 +25,7 @@
import java.net.URL;
import java.util.UUID;
-import org.apache.commons.io.IOUtils;
+import org.apache.tuscany.core.util.IOHelper;
import org.apache.tuscany.host.deployment.ContributionService;
import org.apache.tuscany.host.deployment.DeploymentException;
import org.apache.tuscany.spi.annotation.Autowire;
@@ -69,7 +69,7 @@
try {
return contribute(source, is);
} finally {
- IOUtils.closeQuietly(is);
+ IOHelper.closeQuietly(is);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org