1.1 --- a/openide.util/nbproject/project.properties	Mon Nov 03 12:25:17 2008 -0500
     1.2 +++ b/openide.util/nbproject/project.properties	Mon Nov 03 13:59:35 2008 -0500
     1.3 @@ -40,8 +40,7 @@
     1.4  javac.compilerargs=-Xlint -Xlint:-serial
     1.5  javac.source=1.5
     1.6  module.jar.dir=lib
     1.7 -cp.extra=${nb_all}/libs.javacapi/external/javac-api-nb-7.0-b07.jar
     1.8 -test.unit.run.cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-impl-6-b12.jar
     1.9 +cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-6-b12.jar
    1.10  
    1.11  spec.version.base=7.20.0
    1.12  

     2.1 --- a/openide.util/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java	Mon Nov 03 12:25:17 2008 -0500
     2.2 +++ b/openide.util/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java	Mon Nov 03 13:59:35 2008 -0500
     2.3 @@ -122,7 +122,7 @@
     2.4          scan(args, src, srcIncludes);
     2.5          JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
     2.6          Assert.assertNotNull("no JSR 199 compiler impl found; try e.g.: " +
     2.7 -                "test.unit.run.cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-impl-6-b12.jar", compiler);
     2.8 +                "test.unit.run.cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-6-b12.jar", compiler);
     2.9          //System.err.println("running javac with args: " + args);
    2.10          return compiler.run(null, null, stderr, args.toArray(new String[args.size()])) == 0;
    2.11      }