1.1 --- a/cmdline/lib/nbproject/project.xml	Sun Oct 23 21:46:46 2011 +0200
     1.2 +++ b/cmdline/lib/nbproject/project.xml	Fri Oct 28 17:22:24 2011 +0200
     1.3 @@ -198,6 +198,10 @@
     1.4                          <compile-dependency/>
     1.5                      </test-dependency>
     1.6                      <test-dependency>
     1.7 +                        <code-name-base>org.netbeans.modules.java.hints.declarative</code-name-base>
     1.8 +                        <compile-dependency/>
     1.9 +                    </test-dependency>
    1.10 +                    <test-dependency>
    1.11                          <code-name-base>org.netbeans.modules.java.hints.processor</code-name-base>
    1.12                          <compile-dependency/>
    1.13                      </test-dependency>

     2.1 --- a/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneJar.java	Sun Oct 23 21:46:46 2011 +0200
     2.2 +++ b/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneJar.java	Fri Oct 28 17:22:24 2011 +0200
     2.3 @@ -74,9 +74,12 @@
     2.4  import org.netbeans.modules.classfile.ClassName;
     2.5  import org.netbeans.modules.jackpot30.cmdline.lib.StandaloneTools.RepositoryImpl;
     2.6  import org.netbeans.modules.jackpot30.spi.Hacks.HintPreferencesProvider;
     2.7 +import org.netbeans.modules.java.hints.declarative.DeclarativeHintRegistry;
     2.8  import org.netbeans.modules.java.hints.jackpot.code.CodeHintProviderImpl;
     2.9  import org.netbeans.modules.java.hints.jackpot.code.FSWrapper;
    2.10  import org.netbeans.modules.java.hints.jackpot.impl.Utilities.SPI;
    2.11 +import org.netbeans.modules.java.hints.jackpot.spi.ClassPathBasedHintProvider;
    2.12 +import org.netbeans.modules.java.hints.jackpot.spi.HintProvider;
    2.13  import org.netbeans.spi.editor.mimelookup.MimeDataProvider;
    2.14  import org.openide.util.NbPreferences.Provider;
    2.15  import org.openide.xml.EntityCatalog;
    2.16 @@ -394,7 +397,7 @@
    2.17              DumpHints.class.getName(),
    2.18              RepositoryImpl.class.getName(),
    2.19              "org.netbeans.core.startup.layers.ArchiveURLMapper",
    2.20 -            "org.netbeans.modules.jackpot30.file.DeclarativeHintRegistry",
    2.21 +            DeclarativeHintRegistry.class.getName(),
    2.22              "org.netbeans.core.startup.layers.NbinstURLMapper",
    2.23              "org.netbeans.modules.masterfs.MasterURLMapper",
    2.24              "org.netbeans.core.NbLoaderPool",
    2.25 @@ -414,12 +417,12 @@
    2.26          ));
    2.27  
    2.28      private static final Set<String> COPY_REGISTRATION = new HashSet<String>(Arrays.<String>asList(
    2.29 -            "org.netbeans.modules.jackpot30.spi.HintProvider",
    2.30 -            "org.netbeans.modules.java.hints.jackpot.spi.HintProvider",
    2.31 +            HintProvider.class.getName(),
    2.32              "org.openide.filesystems.URLMapper",
    2.33              "org.openide.util.Lookup",
    2.34              "org.netbeans.modules.openide.util.PreferencesProvider",
    2.35 -            HintPreferencesProvider.class.getName()
    2.36 +            HintPreferencesProvider.class.getName(),
    2.37 +            ClassPathBasedHintProvider.class.getName()
    2.38              ));
    2.39  
    2.40      private static final Set<String> RESOURCES = new HashSet<String>(Arrays.asList(