You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/07/07 02:19:55 UTC
svn commit: rev 22648 - avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks
Author: mcconnell
Date: Tue Jul 6 17:19:55 2004
New Revision: 22648
Modified:
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavacTask.java
Log:
remove referenced to deprecated operations
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java Tue Jul 6 17:19:55 2004
@@ -413,6 +413,7 @@
{
String path = definition.getBaseDir().getCanonicalPath();
+ Project project = getProject();
String basedir = resolveBaseDir( project, path );
writer.write(
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java Tue Jul 6 17:19:55 2004
@@ -271,17 +271,17 @@
final Environment.Variable work = new Environment.Variable();
work.setKey( WORK_DIR_KEY );
work.setValue( working.toString() );
- junit.addSysproperty( work );
+ junit.addConfiguredSysproperty( work );
final Environment.Variable basedir = new Environment.Variable();
basedir.setKey( "basedir" );
basedir.setValue( project.getBaseDir().toString() );
- junit.addSysproperty( basedir );
+ junit.addConfiguredSysproperty( basedir );
final Environment.Variable cache = new Environment.Variable();
cache.setKey( CACHE_PATH_KEY );
cache.setValue( getCachePath() );
- junit.addSysproperty( cache );
+ junit.addConfiguredSysproperty( cache );
final File policy = new File( working, "security.policy" );
if( policy.exists() )
@@ -289,7 +289,7 @@
final Environment.Variable security = new Environment.Variable();
security.setKey( "java.security.policy" );
security.setValue( policy.toString() );
- junit.addSysproperty( security );
+ junit.addConfiguredSysproperty( security );
}
junit.setErrorProperty( ERROR_KEY );
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavacTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavacTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavacTask.java Tue Jul 6 17:19:55 2004
@@ -45,6 +45,9 @@
public static final String FORK_KEY = "java.compile.fork";
public static final boolean FORK_VALUE = false;
+ public static final String DEPRECATION_KEY = "java.compile.deprecation";
+ public static final boolean DEPRECATION_VALUE = true;
+
public void init() throws BuildException
{
if( !isInitialized() )
@@ -121,6 +124,7 @@
final Path.PathElement element = src.createPathElement();
element.setLocation( sources );
javac.setDestdir( classes );
+ javac.setDeprecation( getDeprecationProperty() );
javac.setDebug( getDebugProperty() );
javac.setFork( getForkProperty() );
javac.setClasspath( classpath );
@@ -131,6 +135,11 @@
private boolean getDebugProperty()
{
return getBooleanProperty( DEBUG_KEY, DEBUG_VALUE );
+ }
+
+ private boolean getDeprecationProperty()
+ {
+ return getBooleanProperty( DEPRECATION_KEY, DEPRECATION_VALUE );
}
private boolean getForkProperty()
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org