donaldp 02/03/30 15:51:54
Modified: proposal/myrmidon/src/java/org/apache/antlib/cvslib
ChangeLog.java Resources.properties
Log:
Reflected across from 1nt1.x tree...
Rename basedir to dir and make it default to basedir if not specified
Revision Changes Path
1.6 +9 -10
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/ChangeLog.java
Index: ChangeLog.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/ChangeLog.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog.java 30 Mar 2002 03:21:52 -0000 1.5
+++ ChangeLog.java 30 Mar 2002 23:51:54 -0000 1.6
@@ -57,7 +57,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jeff Martin</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.5 $ $Date: 2002/03/30 03:21:52 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/30 23:51:54 $
* @ant.task name="changelog"
*/
public class ChangeLog
@@ -73,7 +73,7 @@
private Vector m_cvsUsers = new Vector();
/** Input dir */
- private File m_basedir;
+ private File m_dir;
/** Output file */
private File m_destfile;
@@ -98,9 +98,9 @@
/**
* Set the base dir for cvs.
*/
- public void setBasedir( final File basedir )
+ public void setDir( final File dir )
{
- m_basedir = basedir;
+ m_dir = dir;
}
/**
@@ -222,7 +222,7 @@
final ChangeLogParser parser = new ChangeLogParser( userList );
final Execute exe = new Execute();
- exe.setWorkingDirectory( m_basedir );
+ exe.setWorkingDirectory( m_dir );
exe.setCommandline( command );
exe.setExecOutputHandler( parser );
exe.execute( getContext() );
@@ -240,20 +240,19 @@
private void validate()
throws TaskException
{
- if( null == m_basedir )
+ if( null == m_dir )
{
- final String message = REZ.getString(
"changelog.missing-basedir.error" );
- throw new TaskException( message );
+ m_dir = getContext().getBaseDirectory();
}
if( null == m_destfile )
{
final String message = REZ.getString(
"changelog.missing-destfile.error" );
throw new TaskException( message );
}
- if( !m_basedir.exists() )
+ if( !m_dir.exists() )
{
final String message =
- REZ.getString( "changelog.bad-basedir.error",
m_basedir.getAbsolutePath() );
+ REZ.getString( "changelog.bad-basedir.error",
m_dir.getAbsolutePath() );
throw new TaskException( message );
}
if( null != m_usersFile && !m_usersFile.exists() )
1.5 +0 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Resources.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Resources.properties 30 Mar 2002 03:21:52 -0000 1.4
+++ Resources.properties 30 Mar 2002 23:51:54 -0000 1.5
@@ -1,6 +1,5 @@
changelog.nodisplayname.error=Displayname attribute must be set for userID
"{0}".
changelog.nouserid.error=Username attribute must be set.
-changelog.missing-basedir.error=Basedir must be set.
changelog.missing-destfile.error=Destfile must be set.
changelog.bad-basedir.error=Cannot find base dir {0}
changelog.bad-userlist.error=Cannot find user lookup list {0}.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
