You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2018/07/30 21:03:08 UTC
svn commit: r1837091 - in /turbine/core/trunk: pom.xml
src/java/org/apache/turbine/Turbine.java
src/java/org/apache/turbine/services/ui/TurbineUIService.java
Author: tv
Date: Mon Jul 30 21:03:08 2018
New Revision: 1837091
URL: http://svn.apache.org/viewvc?rev=1837091&view=rev
Log:
Remove dependency on commons-io
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1837091&r1=1837090&r2=1837091&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Mon Jul 30 21:03:08 2018
@@ -860,11 +860,6 @@
<artifactId>commons-email</artifactId>
<version>1.5</version>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.6</version>
- </dependency>
<!-- TODO requires Java 1.7 :
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1837091&r1=1837090&r2=1837091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Mon Jul 30 21:03:08 2018
@@ -44,7 +44,6 @@ import javax.xml.parsers.FactoryConfigur
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.logging.Log;
@@ -399,15 +398,17 @@ public class Turbine extends HttpServlet
}
// context resource path has to begin with slash, cft. context.getResource
- if (!descriptorPath.startsWith( "/" )) {
+ if (!descriptorPath.startsWith( "/" ))
+ {
descriptorPath = "/" + descriptorPath;
}
- InputStream reader = context.getResourceAsStream(descriptorPath);
- JAXBContext jaxb = JAXBContext.newInstance(TurbinePipeline.class);
- Unmarshaller unmarshaller = jaxb.createUnmarshaller();
- pipeline = (Pipeline) unmarshaller.unmarshal(reader);
- IOUtils.closeQuietly(reader);
+ try (InputStream reader = context.getResourceAsStream(descriptorPath))
+ {
+ JAXBContext jaxb = JAXBContext.newInstance(TurbinePipeline.class);
+ Unmarshaller unmarshaller = jaxb.createUnmarshaller();
+ pipeline = (Pipeline) unmarshaller.unmarshal(reader);
+ }
log.debug("Initializing pipeline");
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java?rev=1837091&r1=1837090&r2=1837091&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java Mon Jul 30 21:03:08 2018
@@ -20,13 +20,12 @@ package org.apache.turbine.services.ui;
*/
import java.io.File;
+import java.io.FilenameFilter;
import java.io.InputStream;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.configuration.Configuration;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.filefilter.DirectoryFileFilter;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -240,7 +239,15 @@ public class TurbineUIService
public String[] getSkinNames()
{
File skinsDir = new File(servletService.getRealPath(skinsDirectory));
- return skinsDir.list(DirectoryFileFilter.INSTANCE);
+ return skinsDir.list(new FilenameFilter()
+ {
+ @Override
+ public boolean accept(File dir, String name)
+ {
+ File directory = new File(dir, name);
+ return directory.isDirectory();
+ }
+ });
}
/**
@@ -298,13 +305,10 @@ public class TurbineUIService
log.debug("Loading selected skin from: " + sb.toString());
}
- InputStream is = null;
-
- try
+ try (InputStream is = servletService.getResourceAsStream(sb.toString()))
{
// This will NPE if the directory associated with the skin does not
// exist, but it is handled correctly below.
- is = servletService.getResourceAsStream(sb.toString());
skinProperties.load(is);
}
catch (Exception e)
@@ -329,10 +333,6 @@ public class TurbineUIService
return new Properties();
}
}
- finally
- {
- IOUtils.closeQuietly(is);
- }
// Replace in skins HashMap
skins.put(skinName, skinProperties);