You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2001/12/16 07:21:41 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss MSVSS.java
donaldp 01/12/15 22:21:41
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
Available.java Checksum.java Cvs.java ExecTask.java
Input.java Java.java Property.java UpToDate.java
XSLTProcess.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
Native2Ascii.java Rpm.java Script.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
Continuus.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase
CCCheckin.java CCCheckout.java CCUnCheckout.java
CCUpdate.java ClearCase.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet
CSharp.java Ilasm.java NetCommand.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
BorlandDeploymentTool.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit
AggregateTransformer.java JUnitTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Change.java P4Counter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs
Pvcs.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
CovReport.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java
Log:
project.setProperty() -> setProperty()
setProperty() is inherited from AbstractTask and actually delegates to TaskContext to do the work.
project.getBaseDir() -> getBaseDirectory()
getBaseDirectory() is also inherited from AbstractTask and also delegates to TaskContext.
Revision Changes Path
1.5 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
Index: Available.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Available.java 2001/12/16 01:01:19 1.4
+++ Available.java 2001/12/16 06:21:40 1.5
@@ -181,7 +181,7 @@
String lSep = System.getProperty( "line.separator" );
if( null == project.getProperty( property ) )
{
- this.project.setProperty( property, value );
+ setProperty( property, value );
}
//else ignore
}
1.5 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java
Index: Checksum.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Checksum.java 2001/12/16 05:44:55 1.4
+++ Checksum.java 2001/12/16 06:21:40 1.5
@@ -288,7 +288,7 @@
}
else
{
- project.setProperty( prop, checksum );
+ setProperty( prop, checksum );
}
}
else if( destination instanceof java.io.File )
1.4 +1 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Cvs.java
Index: Cvs.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Cvs.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Cvs.java 2001/12/16 00:38:01 1.3
+++ Cvs.java 2001/12/16 06:21:40 1.4
@@ -291,8 +291,7 @@
null );
exe.setAntRun( project );
- if( dest == null )
- dest = project.getBaseDir();
+ if( dest == null ) dest = getBaseDirectory();
exe.setWorkingDirectory( dest );
exe.setCommandline( toExecute.getCommandline() );
1.7 +1 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExecTask.java 2001/12/16 04:37:00 1.6
+++ ExecTask.java 2001/12/16 06:21:40 1.7
@@ -388,8 +388,7 @@
throws TaskException
{
// default directory to the project's base directory
- if( dir == null )
- dir = project.getBaseDir();
+ if( dir == null ) dir = getBaseDirectory();
// show the command
log( cmdl.toString(), Project.MSG_VERBOSE );
1.4 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
Index: Input.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Input.java 2001/12/16 01:31:38 1.3
+++ Input.java 2001/12/16 06:21:40 1.4
@@ -145,7 +145,7 @@
{
if( project.getProperty( addproperty ) == null )
{
- project.setProperty( addproperty, input );
+ setProperty( addproperty, input );
}
else
{
1.5 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Java.java 2001/12/16 01:31:38 1.4
+++ Java.java 2001/12/16 06:21:40 1.5
@@ -386,7 +386,7 @@
if( dir == null )
{
- dir = project.getBaseDir();
+ dir = getBaseDirectory();
}
else if( !dir.exists() || !dir.isDirectory() )
{
1.9 +0 -20 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Property.java 2001/12/16 04:26:06 1.8
+++ Property.java 2001/12/16 06:21:40 1.9
@@ -39,7 +39,6 @@
protected Reference ref;
protected String resource;
- protected boolean userProperty;
protected String value;// set read-only properties
public Property()
@@ -47,11 +46,6 @@
super();
}
- protected Property( boolean userProperty )
- {
- this.userProperty = userProperty;
- }
-
public void setClasspath( Path classpath )
throws TaskException
{
@@ -207,21 +201,7 @@
protected void addProperty( String n, String v )
{
- if( userProperty )
- {
- if( project.getUserProperty( n ) == null )
- {
- project.setUserProperty( n, v );
- }
- else
- {
- log( "Override ignored for " + n, Project.MSG_VERBOSE );
- }
- }
- else
- {
project.setNewProperty( n, v );
- }
}
protected void loadEnvironment( String prefix )
1.6 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
Index: UpToDate.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UpToDate.java 2001/12/16 02:05:41 1.5
+++ UpToDate.java 2001/12/16 06:21:40 1.6
@@ -147,7 +147,7 @@
boolean upToDate = eval();
if( upToDate )
{
- this.project.setProperty( _property, this.getValue() );
+ setProperty( _property, this.getValue() );
if( mapperElement == null )
{
log( "File \"" + _targetFile.getAbsolutePath() + "\" is up to date.",
1.6 +9 -3 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSLTProcess.java 2001/12/16 05:44:55 1.5
+++ XSLTProcess.java 2001/12/16 06:21:40 1.6
@@ -39,8 +39,9 @@
* @author <a href="mailto:russgold@acm.org">Russell Gold</a>
* @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
*/
-
-public class XSLTProcess extends MatchingTask implements XSLTLogger
+public class XSLTProcess
+ extends MatchingTask
+ implements XSLTLogger
{
private File destDir = null;
@@ -67,6 +68,11 @@
private String processor;
+ public void log( String msg )
+ {
+ getLogger().info( msg );
+ }
+
/**
* Creates a new XSLTProcess Task.
*/
@@ -229,7 +235,7 @@
if( baseDir == null )
{
- baseDir = resolveFile( "." );
+ baseDir = getBaseDirectory();
}
liaison = getLiaison();
1.5 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
Index: Native2Ascii.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Native2Ascii.java 2001/12/16 05:44:55 1.4
+++ Native2Ascii.java 2001/12/16 06:21:40 1.5
@@ -117,7 +117,7 @@
// default srcDir to basedir
if( srcDir == null )
{
- srcDir = resolveFile( "." );
+ srcDir = getBaseDirectory();
}
// Require destDir
1.6 +1 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
Index: Rpm.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Rpm.java 2001/12/16 05:44:55 1.5
+++ Rpm.java 2001/12/16 06:21:40 1.6
@@ -190,8 +190,7 @@
Execute exe = new Execute( streamhandler, null );
exe.setAntRun( project );
- if( topDir == null )
- topDir = project.getBaseDir();
+ if( topDir == null ) topDir = getBaseDirectory();
exe.setWorkingDirectory( topDir );
exe.setCommandline( toExecute.getCommandline() );
1.4 +0 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
Index: Script.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Script.java 2001/12/16 00:33:54 1.3
+++ Script.java 2001/12/16 06:21:40 1.4
@@ -87,7 +87,6 @@
try
{
addBeans( project.getProperties() );
- addBeans( project.getUserProperties() );
addBeans( project.getTargets() );
addBeans( project.getReferences() );
1.6 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
Index: Continuus.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Continuus.java 2001/12/16 04:12:39 1.5
+++ Continuus.java 2001/12/16 06:21:40 1.6
@@ -113,7 +113,7 @@
{
Execute exe = new Execute( handler );
exe.setAntRun( getProject() );
- exe.setWorkingDirectory( getProject().getBaseDir() );
+ exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
}
1.4 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java
Index: CCCheckin.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CCCheckin.java 2001/12/16 00:37:26 1.3
+++ CCCheckin.java 2001/12/16 06:21:40 1.4
@@ -331,7 +331,7 @@
// Default the viewpath to basedir if it is not specified
if( getViewPath() == null )
{
- setViewPath( aProj.getBaseDir().getPath() );
+ setViewPath( getBaseDirectory().getPath() );
}
// build the command line from what we got. the format is
1.4 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
Index: CCCheckout.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CCCheckout.java 2001/12/16 00:37:26 1.3
+++ CCCheckout.java 2001/12/16 06:21:40 1.4
@@ -419,7 +419,7 @@
// Default the viewpath to basedir if it is not specified
if( getViewPath() == null )
{
- setViewPath( aProj.getBaseDir().getPath() );
+ setViewPath( getBaseDirectory().getPath() );
}
// build the command line from what we got the format is
1.4 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
Index: CCUnCheckout.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CCUnCheckout.java 2001/12/16 00:37:27 1.3
+++ CCUnCheckout.java 2001/12/16 06:21:40 1.4
@@ -123,7 +123,7 @@
// Default the viewpath to basedir if it is not specified
if( getViewPath() == null )
{
- setViewPath( aProj.getBaseDir().getPath() );
+ setViewPath( getBaseDirectory().getPath() );
}
// build the command line from what we got the format is
1.4 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
Index: CCUpdate.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CCUpdate.java 2001/12/16 00:37:27 1.3
+++ CCUpdate.java 2001/12/16 06:21:40 1.4
@@ -332,7 +332,7 @@
// Default the viewpath to basedir if it is not specified
if( getViewPath() == null )
{
- setViewPath( aProj.getBaseDir().getPath() );
+ setViewPath( getBaseDirectory().getPath() );
}
// build the command line from what we got the format is
1.5 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
Index: ClearCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClearCase.java 2001/12/16 02:05:42 1.4
+++ ClearCase.java 2001/12/16 06:21:40 1.5
@@ -111,7 +111,7 @@
Project aProj = getProject();
Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ) );
exe.setAntRun( aProj );
- exe.setWorkingDirectory( aProj.getBaseDir() );
+ exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
}
1.6 +1 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
Index: CSharp.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CSharp.java 2001/12/16 05:44:56 1.5
+++ CSharp.java 2001/12/16 06:21:41 1.6
@@ -649,8 +649,7 @@
public void execute()
throws TaskException
{
- if( _srcDir == null )
- _srcDir = resolveFile( "." );
+ if( _srcDir == null ) _srcDir = getBaseDirectory();
NetCommand command = new NetCommand( this, "CSC", csc_exe_name );
command.setFailOnError( getFailFailOnError() );
1.6 +1 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
Index: Ilasm.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Ilasm.java 2001/12/16 05:44:56 1.5
+++ Ilasm.java 2001/12/16 06:21:41 1.6
@@ -306,8 +306,7 @@
public void execute()
throws TaskException
{
- if( _srcDir == null )
- _srcDir = resolveFile( "." );
+ if( _srcDir == null ) _srcDir = getBaseDirectory();
//get dependencies list.
DirectoryScanner scanner = super.getDirectoryScanner( _srcDir );
1.6 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
Index: NetCommand.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NetCommand.java 2001/12/16 05:44:56 1.5
+++ NetCommand.java 2001/12/16 06:21:41 1.6
@@ -200,7 +200,7 @@
throws TaskException
{
// default directory to the project's base directory
- File dir = _owner.getProject().getBaseDir();
+ File dir = _owner.getBaseDirectory();
ExecuteStreamHandler handler = new LogStreamHandler( _owner,
Project.MSG_INFO, Project.MSG_WARN );
_exe = new Execute( handler, null );
1.6 +3 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
Index: BorlandDeploymentTool.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BorlandDeploymentTool.java 2001/12/16 04:12:39 1.5
+++ BorlandDeploymentTool.java 2001/12/16 06:21:41 1.6
@@ -416,8 +416,9 @@
*/
private void generateClient( File sourceJar )
{
- getTask().getProject().addTaskDefinition( "internal_bas_generateclient",
- org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class );
+ //UGLY HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ //getTask().getProject().addTaskDefinition( "internal_bas_generateclient",
+ //org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class );
org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient gentask = null;
log( "generate client for " + sourceJar, Project.MSG_INFO );
1.5 +2 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
Index: AggregateTransformer.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AggregateTransformer.java 2001/12/16 05:44:56 1.4
+++ AggregateTransformer.java 2001/12/16 06:21:41 1.5
@@ -215,12 +215,12 @@
// set the destination directory relative from the project if needed.
if( toDir == null )
{
- toDir = FileUtils.newFileUtils().resolveFile( task.getProject().getBaseDir(), "." );
+ toDir = FileUtils.newFileUtils().resolveFile( task.getBaseDirectory(), "." );
}
else if( !toDir.isAbsolute() )
{
toDir = FileUtils.newFileUtils().
- resolveFile( task.getProject().getBaseDir(), toDir.getPath() );
+ resolveFile( task.getBaseDirectory(), toDir.getPath() );
}
}
1.6 +3 -3 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JUnitTask.java 2001/12/16 05:51:12 1.5
+++ JUnitTask.java 2001/12/16 06:21:41 1.6
@@ -524,7 +524,7 @@
//@todo should be moved to the test class instead.
if( test.getTodir() == null )
{
- test.setTodir( resolveFile( "." ) );
+ test.setTodir( getBaseDirectory() );
}
if( test.getOutfile() == null )
@@ -568,11 +568,11 @@
+ ( wasKilled ? " (timeout)" : "" ), Project.MSG_ERR );
if( errorOccurredHere && test.getErrorProperty() != null )
{
- project.setProperty( test.getErrorProperty(), "true" );
+ setProperty( test.getErrorProperty(), "true" );
}
if( failureOccurredHere && test.getFailureProperty() != null )
{
- project.setProperty( test.getFailureProperty(), "true" );
+ setProperty( test.getFailureProperty(), "true" );
}
}
}
1.3 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
Index: P4Change.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- P4Change.java 2001/12/16 00:35:04 1.2
+++ P4Change.java 2001/12/16 06:21:41 1.3
@@ -96,7 +96,7 @@
int changenumber = Integer.parseInt( line );
log( "Change Number is " + changenumber, Project.MSG_INFO );
- myProj.setProperty( "p4.change", "" + changenumber );
+ setProperty( "p4.change", "" + changenumber );
}
else if( util.match( "/error/", line ) )
1.3 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
Index: P4Counter.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- P4Counter.java 2001/12/16 00:35:05 1.2
+++ P4Counter.java 2001/12/16 06:21:41 1.3
@@ -87,7 +87,7 @@
try
{
value = Integer.parseInt( line );
- myProj.setProperty( property, "" + value );
+ setProperty( property, "" + value );
}
catch( NumberFormatException nfe )
{
1.5 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
Index: Pvcs.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Pvcs.java 2001/12/16 02:05:43 1.4
+++ Pvcs.java 2001/12/16 06:21:41 1.5
@@ -453,7 +453,7 @@
Project aProj = getProject();
Execute exe = new Execute( out );
exe.setAntRun( aProj );
- exe.setWorkingDirectory( aProj.getBaseDir() );
+ exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
}
1.5 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
Index: CovReport.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CovReport.java 2001/12/16 05:44:57 1.4
+++ CovReport.java 2001/12/16 06:21:41 1.5
@@ -291,7 +291,7 @@
if( sourcePath == null )
{
sourcePath = new Path( project );
- sourcePath.createPath().setLocation( resolveFile( "." ) );
+ sourcePath.createPath().setLocation( getBaseDirectory() );
}
v.addElement( "-sourcepath=" + sourcePath );
1.5 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MSVSS.java 2001/12/16 02:05:43 1.4
+++ MSVSS.java 2001/12/16 06:21:41 1.5
@@ -228,7 +228,7 @@
}
exe.setAntRun( project );
- exe.setWorkingDirectory( project.getBaseDir() );
+ exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>