You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2009/03/31 23:35:52 UTC
svn commit: r760663 - in /ode/branches/APACHE_ODE_1.X:
axis2/src/main/java/org/apache/ode/axis2/service/DeploymentBrowser.java
bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java
Author: midon
Date: Tue Mar 31 21:35:52 2009
New Revision: 760663
URL: http://svn.apache.org/viewvc?rev=760663&view=rev
Log:
remove duplicate method #listFilesRecursively, use #directoryEntriesInPath instead
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentBrowser.java
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java
Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentBrowser.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentBrowser.java?rev=760663&r1=760662&r2=760663&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentBrowser.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentBrowser.java Tue Mar 31 21:35:52 2009
@@ -271,7 +271,7 @@
private String bundleUrlFor(String docFile) {
if (docFile.indexOf("processes") >= 0) docFile = docFile.substring(docFile.indexOf("processes")+10);
- List<File> files = FileUtils.listFilesRecursively(_store.getDeployDir(), null);
+ List<File> files = FileUtils.directoryEntriesInPath(_store.getDeployDir(), null);
for (final File bundleFile : files) {
if (bundleFile.getPath().replaceAll("\\\\", "/").endsWith(docFile))
return "/deployment/bundles/" + bundleFile.getPath()
Modified: ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java?rev=760663&r1=760662&r2=760663&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java Tue Mar 31 21:35:52 2009
@@ -129,7 +129,7 @@
* starts compilation.
*/
void compile() {
- ArrayList<File> bpels = FileUtils.listFilesRecursively(_duDirectory, DeploymentUnitDir._bpelFilter);
+ List<File> bpels = FileUtils.directoryEntriesInPath(_duDirectory, DeploymentUnitDir._bpelFilter);
if (bpels.size() == 0)
throw new IllegalArgumentException("Directory " + _duDirectory.getName() + " does not contain any process!");
for (File bpel : bpels) {
@@ -139,7 +139,7 @@
void scan() {
HashMap<QName, CBPInfo> processes = new HashMap<QName, CBPInfo>();
- ArrayList<File> cbps = FileUtils.listFilesRecursively(_duDirectory, DeploymentUnitDir._cbpFilter);
+ List<File> cbps = FileUtils.directoryEntriesInPath(_duDirectory, DeploymentUnitDir._cbpFilter);
for (File file : cbps) {
CBPInfo cbpinfo = loadCBPInfo(file);
processes.put(cbpinfo.processName, cbpinfo);
@@ -250,7 +250,7 @@
WSDLReader r = wsdlFactory.newWSDLReader();
DefaultResourceFinder rf = new DefaultResourceFinder(_duDirectory, _duDirectory);
URI basedir = _duDirectory.toURI();
- ArrayList<File> wsdls = FileUtils.listFilesRecursively(_duDirectory, DeploymentUnitDir._wsdlFilter);
+ List<File> wsdls = FileUtils.directoryEntriesInPath(_duDirectory, DeploymentUnitDir._wsdlFilter);
for (File file : wsdls) {
URI uri = basedir.relativize(file.toURI());
try {
Modified: ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java?rev=760663&r1=760662&r2=760663&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java (original)
+++ ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java Tue Mar 31 21:35:52 2009
@@ -159,18 +159,4 @@
public static String encodePath(String path) {
return path.replaceAll(" ", "%20");
}
-
- public static ArrayList<File> listFilesRecursively(File root, FileFilter filter) {
- ArrayList<File> result = new ArrayList<File>();
- // Filtering the files we're interested in in the current directory
- File[] select = root.listFiles(filter);
- result.addAll(Arrays.asList(select));
- // Then we can check the directories
- File[] all = root.listFiles();
- for (File file : all)
- if (file.isDirectory())
- result.addAll(listFilesRecursively(file, filter));
- return result;
- }
-
}