Author: midon
Date: Tue Mar 31 21:38:26 2009
New Revision: 760667
URL: http://svn.apache.org/viewvc?rev=760667&view=rev
Log:
ODE-566: sort endpoint files
Added:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/alpha_subdir/
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/alpha_subdir/test-endpoint-properties-deploy-unit_headerBB_2.endpoint
Removed:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/test-endpoint-properties-deploy-unit_headerBB_2.endpoint
Modified:
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
Added:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/alpha_subdir/test-endpoint-properties-deploy-unit_headerBB_2.endpoint
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/alpha_subdir/test-endpoint-properties-deploy-unit_headerBB_2.endpoint?rev=760667&view=auto
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/alpha_subdir/test-endpoint-properties-deploy-unit_headerBB_2.endpoint
(added)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/alpha_subdir/test-endpoint-properties-deploy-unit_headerBB_2.endpoint
Tue Mar 31 21:38:26 2009
@@ -0,0 +1,4 @@
+
+alias.myns2=http://ode/bpel/test/properties
+
+myns2.PropertiesService.ode.http.default-headers.header_BB=from_deployment_unit#file2
\ No newline at end of file
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=760667&r1=760666&r2=760667&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:38:26 2009
@@ -213,13 +213,13 @@
/**
*
- * @return the list of endpoint configuration files. the list is built on
each call to handle changes.
+ * The list of endpoint configuration files contained in the deployment
directory and its subdirectories.
+ * Files are ordered lexicographically but for each directory, files come
before its sudirectories.
+ * <p>The list is built on each call to handle changes.
+ * @see
org.apache.ode.utils.fs.FileUtils#directoryEntriesInPath(java.io.File)
*/
- public TreeSet<File> getEndpointConfigFiles() {
- File[] files = getDeployDir().listFiles(_endpointFilter);
- TreeSet<File> set = new TreeSet<File>();
- if(files!=null) set.addAll(Arrays.asList(files));
- return set;
+ public List<File> getEndpointConfigFiles() {
+ return
FileUtils.directoryEntriesInPath(getDeployDir(),_endpointFilter);
}
public DeployDocument getDeploymentDescriptor() {
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=760667&r1=760666&r2=760667&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:38:26 2009
@@ -106,9 +106,9 @@
/**
* Recursively collect all Files in the given directory and all its
* subdirectories, applying the given FileFilter. The FileFilter is also
applied to the given rootDirectory.
- * As a result the rootDirectory might be contained in the returned list.
+ * As a result the rootDirectory might be in the returned list.
* <p>
- * Returned files are sorted lexicographically but for each directory,
files come before its sudirectories.
+ * Returned files are ordered lexicographically but for each directory,
files come before its sudirectories.
* For instance:<br/>
* test<br/>
* test/alpha.txt<br/>
@@ -126,7 +126,7 @@
* test/z<br/>
* test/z/zulu.txt<br/>
* test/zulu.txt<br/>
- * lexicographically
+ *
* @param rootDirectory
* the top level directory used for the search
* @param filter
