Author: sgoeschl
Date: Mon Aug 29 11:04:36 2005
New Revision: 264189
URL: http://svn.apache.org/viewcvs?rev=264189&view=rev
Log:
Ignoring the Subversion directory otherwise a JUNIT test file since it picks up
a README.TXT
Modified:
jakarta/turbine/fulcrum/trunk/resourcemanager/project.xml
jakarta/turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/FileResourceManager.java
jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml
Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/resourcemanager/project.xml?rev=264189&r1=264188&r2=264189&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/project.xml Mon Aug 29
11:04:36 2005
@@ -3,7 +3,7 @@
<extend>${basedir}/../project.xml</extend>
<id>fulcrum-resourcemanager</id>
<name>Fulcrum ResourceManager Component</name>
- <currentVersion>1.0.0</currentVersion>
+ <currentVersion>1.0.1-dev</currentVersion>
<dependencies>
Modified:
jakarta/turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/FileResourceManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/FileResourceManager.java?rev=264189&r1=264188&r2=264189&view=diff
==============================================================================
---
jakarta/turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/FileResourceManager.java
(original)
+++
jakarta/turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/FileResourceManager.java
Mon Aug 29 11:04:36 2005
@@ -52,6 +52,9 @@
/** the cached list of all available resources */
private String[] resourceFileNameList;
+ /** the name of the subversion metadata directory */
+ private static final String SVN_DIRNAME = ".svn";
+
/////////////////////////////////////////////////////////////////////////
// Avalon Service Lifecycle Implementation
/////////////////////////////////////////////////////////////////////////
@@ -457,7 +460,9 @@
for( int i=0; i<list.length; i++ )
{
- if( list[i].isDirectory() )
+ // skip the subversion directories otherwise we pick up
unexpected files
+
+ if( list[i].isDirectory() &&
(list[i].getName().equalsIgnoreCase(SVN_DIRNAME) == false) )
{
this.findAllResources( list[i], suffix, result );
}
Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml?rev=264189&r1=264188&r2=264189&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml Mon Aug 29
11:04:36 2005
@@ -2,10 +2,15 @@
<document>
<properties>
<title>Fulcrum ResourceManager Service</title>
- <author email="[EMAIL PROTECTED]">Siegfried Goeschl</author>
+ <author email="[EMAIL PROTECTED]">Siegfried Goeschl</author>
</properties>
<body>
+ <release version="1.0.1-dev" date="in SVN">
+ <action dev="sgoeschl" type="fix">
+ Skipping all ".svn" directories otherwise we pick up arbitrary files
+ </action>
+ </release>
<release version="1.0.0" date="in CVS">
<action dev="sgoeschl" type="add">
Initial version
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
