1.1 --- a/cmdline/compiler/nbproject/genfiles.properties	Sat Mar 10 21:29:16 2012 +0100
     1.2 +++ b/cmdline/compiler/nbproject/genfiles.properties	Sun Mar 11 12:39:49 2012 +0100
     1.3 @@ -3,6 +3,6 @@
     1.4  build.xml.stylesheet.CRC32=79c3b980@1.33
     1.5  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     1.6  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     1.7 -nbproject/build-impl.xml.data.CRC32=2ffedfaa
     1.8 +nbproject/build-impl.xml.data.CRC32=dcf519c4
     1.9  nbproject/build-impl.xml.script.CRC32=64f6fe95
    1.10  nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49

     2.1 --- a/cmdline/compiler/nbproject/project.xml	Sat Mar 10 21:29:16 2012 +0100
     2.2 +++ b/cmdline/compiler/nbproject/project.xml	Sun Mar 11 12:39:49 2012 +0100
     2.3 @@ -158,7 +158,7 @@
     2.4                      <build-prerequisite/>
     2.5                      <compile-dependency/>
     2.6                      <run-dependency>
     2.7 -                        <specification-version>1.0.1.18.9.20.6</specification-version>
     2.8 +                        <implementation-version/>
     2.9                      </run-dependency>
    2.10                  </dependency>
    2.11                  <dependency>
    2.12 @@ -237,10 +237,6 @@
    2.13                          <compile-dependency/>
    2.14                      </test-dependency>
    2.15                      <test-dependency>
    2.16 -                        <code-name-base>org.netbeans.modules.java.hints.processor</code-name-base>
    2.17 -                        <compile-dependency/>
    2.18 -                    </test-dependency>
    2.19 -                    <test-dependency>
    2.20                          <code-name-base>org.netbeans.modules.masterfs</code-name-base>
    2.21                          <compile-dependency/>
    2.22                      </test-dependency>

     3.1 --- a/cmdline/lib/nbproject/project.xml	Sat Mar 10 21:29:16 2012 +0100
     3.2 +++ b/cmdline/lib/nbproject/project.xml	Sun Mar 11 12:39:49 2012 +0100
     3.3 @@ -204,10 +204,6 @@
     3.4                          <compile-dependency/>
     3.5                      </test-dependency>
     3.6                      <test-dependency>
     3.7 -                        <code-name-base>org.netbeans.modules.java.hints.processor</code-name-base>
     3.8 -                        <compile-dependency/>
     3.9 -                    </test-dependency>
    3.10 -                    <test-dependency>
    3.11                          <code-name-base>org.netbeans.modules.masterfs</code-name-base>
    3.12                          <compile-dependency/>
    3.13                      </test-dependency>

     4.1 --- a/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneJar.java	Sat Mar 10 21:29:16 2012 +0100
     4.2 +++ b/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneJar.java	Sun Mar 11 12:39:49 2012 +0100
     4.3 @@ -82,8 +82,11 @@
     4.4  import org.netbeans.modules.java.hints.providers.code.FSWrapper;
     4.5  import org.netbeans.modules.java.hints.providers.spi.ClassPathBasedHintProvider;
     4.6  import org.netbeans.modules.java.hints.providers.spi.HintProvider;
     4.7 +import org.netbeans.modules.java.hints.spiimpl.RulesManager;
     4.8 +import org.netbeans.modules.java.hints.spiimpl.RulesManagerImpl;
     4.9  import org.netbeans.modules.java.hints.spiimpl.Utilities.SPI;
    4.10  import org.netbeans.spi.editor.mimelookup.MimeDataProvider;
    4.11 +import org.openide.filesystems.MIMEResolver;
    4.12  import org.openide.util.NbPreferences.Provider;
    4.13  import org.openide.xml.EntityCatalog;
    4.14  import org.openide.xml.XMLUtil;
    4.15 @@ -231,6 +234,7 @@
    4.16          registrations.add(new MetaInfRegistration(Provider.class.getName(), StandaloneTools.PreferencesProvider.class.getName(), 0));
    4.17          registrations.add(new MetaInfRegistration(MimeDataProvider.class.getName(), StandaloneTools.StandaloneMimeDataProviderImpl.class.getName()));
    4.18          registrations.add(new MetaInfRegistration(SPI.class.getName(), StandaloneTools.UtilitiesSPIImpl.class.getName()));
    4.19 +        registrations.add(new MetaInfRegistration(MIMEResolver.class.getName(), JavaMimeResolver.class.getName()));
    4.20          registrations.addAll(info.metaInf);
    4.21  
    4.22          Map<String, Collection<MetaInfRegistration>> api2Registrations = new HashMap<String, Collection<MetaInfRegistration>>();
    4.23 @@ -416,6 +420,7 @@
    4.24              "org.netbeans.core.startup.preferences.PreferencesProviderImpl",
    4.25              "org.netbeans.modules.java.platform.DefaultJavaPlatformProvider",
    4.26              IndexAccess.class.getName(),
    4.27 +            RulesManagerImpl.class.getName(),
    4.28              
    4.29              "com.sun.tools.javac.resources.compiler",
    4.30              "com.sun.tools.javac.resources.javac",
    4.31 @@ -424,7 +429,7 @@
    4.32              PositionIncrementAttributeImpl.class.getName()
    4.33  
    4.34  
    4.35 -            , "org.netbeans.modules.java.hints.infrastructure.RulesManager$HintProviderImpl"
    4.36 +            , "org.netbeans.modules.java.hints.legacy.spi.RulesManager$HintProviderImpl"
    4.37              , Tree.class.getName()
    4.38              ,JavacTool.class.getName()
    4.39              ,JavaMimeResolver.class.getName()
    4.40 @@ -437,8 +442,8 @@
    4.41              "org.netbeans.modules.openide.util.PreferencesProvider",
    4.42              HintPreferencesProvider.class.getName(),
    4.43              ClassPathBasedHintProvider.class.getName(),
    4.44 -            "org.openide.filesystems.MIMEResolver",
    4.45 -            IndexAccess.class.getName()
    4.46 +            IndexAccess.class.getName(),
    4.47 +            RulesManager.class.getName()
    4.48              ));
    4.49  
    4.50      private static final Set<String> RESOURCES = new HashSet<String>(Arrays.asList(

     5.1 --- a/cmdline/nbproject/platform.properties	Sat Mar 10 21:29:16 2012 +0100
     5.2 +++ b/cmdline/nbproject/platform.properties	Sun Mar 11 12:39:49 2012 +0100
     5.3 @@ -20,4 +20,4 @@
     5.4  extcluster.../remoting/common/build/cluster.sources=
     5.5  extcluster.../remoting/ide/build/cluster.javadoc=
     5.6  extcluster.../remoting/ide/build/cluster.sources=
     5.7 -nbplatform.active=trunk
     5.8 +nbplatform.active=default

     6.1 --- a/language/ide/nbproject/platform.properties	Sat Mar 10 21:29:16 2012 +0100
     6.2 +++ b/language/ide/nbproject/platform.properties	Sun Mar 11 12:39:49 2012 +0100
     6.3 @@ -13,4 +13,4 @@
     6.4  extcluster.../../remoting/ide/build/cluster.sources=../../remoting/ide
     6.5  extcluster.../remoting/common/build/cluster.javadoc=
     6.6  extcluster.../remoting/common/build/cluster.sources=../../remoting/common
     6.7 -nbplatform.active=trunk
     6.8 +nbplatform.active=default

     7.1 --- a/language/ide/ui/nbproject/genfiles.properties	Sat Mar 10 21:29:16 2012 +0100
     7.2 +++ b/language/ide/ui/nbproject/genfiles.properties	Sun Mar 11 12:39:49 2012 +0100
     7.3 @@ -1,8 +1,8 @@
     7.4 -build.xml.data.CRC32=6a9d4938
     7.5 +build.xml.data.CRC32=8131ef5a
     7.6  build.xml.script.CRC32=4ac38acd
     7.7  build.xml.stylesheet.CRC32=a56c6a5b@2.49
     7.8  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     7.9  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    7.10 -nbproject/build-impl.xml.data.CRC32=6a9d4938
    7.11 +nbproject/build-impl.xml.data.CRC32=8131ef5a
    7.12  nbproject/build-impl.xml.script.CRC32=e59dabeb
    7.13  nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49

     8.1 --- a/language/ide/ui/nbproject/project.xml	Sat Mar 10 21:29:16 2012 +0100
     8.2 +++ b/language/ide/ui/nbproject/project.xml	Sun Mar 11 12:39:49 2012 +0100
     8.3 @@ -139,6 +139,10 @@
     8.4                          <code-name-base>org.netbeans.spi.editor.hints</code-name-base>
     8.5                          <compile-dependency/>
     8.6                      </test-dependency>
     8.7 +                    <test-dependency>
     8.8 +                        <code-name-base>org.netbeans.spi.java.hints</code-name-base>
     8.9 +                        <compile-dependency/>
    8.10 +                    </test-dependency>
    8.11                  </test-type>
    8.12              </test-dependencies>
    8.13              <public-packages/>

     9.1 --- a/language/ide/ui/test/unit/src/org/netbeans/modules/jackpot30/ui/PatternGeneratorTest.java	Sat Mar 10 21:29:16 2012 +0100
     9.2 +++ b/language/ide/ui/test/unit/src/org/netbeans/modules/jackpot30/ui/PatternGeneratorTest.java	Sun Mar 11 12:39:49 2012 +0100
     9.3 @@ -47,8 +47,8 @@
     9.4  import java.util.concurrent.atomic.AtomicBoolean;
     9.5  import org.netbeans.api.java.source.CompilationInfo;
     9.6  import org.netbeans.modules.java.hints.infrastructure.TreeRuleTestBase;
     9.7 -import org.netbeans.modules.java.hints.jackpot.impl.hints.HintsInvoker;
     9.8  import org.netbeans.modules.java.hints.jackpot.spi.PatternConvertor;
     9.9 +import org.netbeans.modules.java.hints.spiimpl.hints.HintsInvoker;
    9.10  import org.netbeans.spi.editor.hints.ErrorDescription;
    9.11  
    9.12  /**

    10.1 --- a/remoting/build.sh	Sat Mar 10 21:29:16 2012 +0100
    10.2 +++ b/remoting/build.sh	Sun Mar 11 12:39:49 2012 +0100
    10.3 @@ -1,4 +1,6 @@
    10.4  #!/bin/bash
    10.5 +(cd common; ant "$@" clean && ant "$@" nbms) || exit 1
    10.6 +(cd ide; ant "$@" clean && ant "$@" nbms) || exit 1
    10.7  rm -rf build
    10.8  mkdir -p build/indexing-backend
    10.9  (cd server/indexer; ant "$@" clean && ant "$@" build-zip && unzip -d ../../build/indexing-backend dist/indexer.zip) || exit 1
   10.10 @@ -17,5 +19,3 @@
   10.11  
   10.12  mkdir -p ide/local/release/index-server
   10.13  (cd server/web/web.main; cp -r dist/* ../../../ide/local/release/index-server) || exit 1
   10.14 -(cd ide; ant "$@" clean && ant "$@" nbms) || exit 1
   10.15 -