1.1 --- a/autoproject.core/nbproject/project.xml	Wed Nov 16 16:21:34 2011 -0500
     1.2 +++ b/autoproject.core/nbproject/project.xml	Wed Nov 16 16:26:39 2011 -0500
     1.3 @@ -65,6 +65,14 @@
     1.4                      </run-dependency>
     1.5                  </dependency>
     1.6                  <dependency>
     1.7 +                    <code-name-base>org.openide.loaders</code-name-base>
     1.8 +                    <build-prerequisite/>
     1.9 +                    <compile-dependency/>
    1.10 +                    <run-dependency>
    1.11 +                        <specification-version>7.32</specification-version>
    1.12 +                    </run-dependency>
    1.13 +                </dependency>
    1.14 +                <dependency>
    1.15                      <code-name-base>org.openide.nodes</code-name-base>
    1.16                      <build-prerequisite/>
    1.17                      <compile-dependency/>

     2.1 --- a/autoproject.core/src/org/netbeans/modules/autoproject/core/Bundle.properties	Wed Nov 16 16:21:34 2011 -0500
     2.2 +++ b/autoproject.core/src/org/netbeans/modules/autoproject/core/Bundle.properties	Wed Nov 16 16:26:39 2011 -0500
     2.3 @@ -8,5 +8,4 @@
     2.4  CMD_javadoc=Generate Javadoc
     2.5  CMD_deploy=Deploy
     2.6  CMD_redeploy=Redeploy
     2.7 -Templates/Project/Standard/auto-project=Automatic Project
     2.8  options-export-displayName=Automatic Projects

     3.1 --- a/autoproject.core/src/org/netbeans/modules/autoproject/core/layer.xml	Wed Nov 16 16:21:34 2011 -0500
     3.2 +++ b/autoproject.core/src/org/netbeans/modules/autoproject/core/layer.xml	Wed Nov 16 16:26:39 2011 -0500
     3.3 @@ -9,18 +9,4 @@
     3.4              </file>
     3.5          </folder>
     3.6      </folder>
     3.7 -    <folder name="Templates">
     3.8 -        <folder name="Project">
     3.9 -            <folder name="Standard">
    3.10 -                <file name="auto-project">
    3.11 -                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.autoproject.core.Bundle"/>
    3.12 -                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/autoproject/core/autoproject.png"/>
    3.13 -                    <attr name="instantiatingIterator" newvalue="org.netbeans.modules.autoproject.wizard.AutoProjectWizardIterator"/>
    3.14 -                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/autoproject/wizard/AutoProjectDescription.html"/>
    3.15 -                    <attr name="template" boolvalue="true"/>
    3.16 -                    <attr name="position" intvalue="410"/>
    3.17 -                </file>
    3.18 -            </folder>
    3.19 -        </folder>
    3.20 -    </folder>
    3.21  </filesystem>

     4.1 --- a/autoproject.core/src/org/netbeans/modules/autoproject/wizard/AutoProjectWizardIterator.java	Wed Nov 16 16:21:34 2011 -0500
     4.2 +++ b/autoproject.core/src/org/netbeans/modules/autoproject/wizard/AutoProjectWizardIterator.java	Wed Nov 16 16:26:39 2011 -0500
     4.3 @@ -50,6 +50,7 @@
     4.4  import java.util.logging.Logger;
     4.5  import javax.swing.JComponent;
     4.6  import javax.swing.event.ChangeListener;
     4.7 +import org.netbeans.api.templates.TemplateRegistration;
     4.8  import org.netbeans.modules.autoproject.spi.Cache;
     4.9  import org.netbeans.spi.project.ui.support.ProjectChooser;
    4.10  import org.netbeans.spi.project.ui.templates.support.Templates;
    4.11 @@ -61,6 +62,14 @@
    4.12  import static org.netbeans.modules.autoproject.wizard.Bundle.*;
    4.13  import org.openide.util.NbBundle.Messages;
    4.14  
    4.15 +@TemplateRegistration(
    4.16 +    folder="Project/Standard",
    4.17 +    position=410,
    4.18 +    displayName="#template",
    4.19 +    iconBase="org/netbeans/modules/autoproject/core/autoproject.png",
    4.20 +    description="AutoProjectDescription.html"
    4.21 +)
    4.22 +@Messages("template=Automatic Project")
    4.23  public class AutoProjectWizardIterator implements WizardDescriptor.InstantiatingIterator {
    4.24      private int index;
    4.25