Attachment #136106 for bug #222525

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 222525
Collapse All | Expand All





import org.netbeans.api.templates.TemplateRegistration;
import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSampleWizardIterator;
import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSiteTemplate;
import org.netbeans.modules.web.clientproject.createprojectapi.CreateProjectProperties;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;


public class AngularJSPhoneCat extends OnlineSampleWizardIterator {

    @Override
    protected OnlineSiteTemplate getSiteTemplate() {
        return new AngularJSTemplate(
                "ANGULAR-SAMPLE",
                getProjectName(),
                getProjectZipURL(),
                "angular-angular-phonecat-step-11-0-g9aebada.zip"); // NOI18N


    private static class AngularJSTemplate extends OnlineSiteTemplate {

        public AngularJSTemplate(String name, String url, String zipName) {
            super(name, url, zipName);
        }

        @Override
        public void configure(CreateProjectProperties projectProperties) {
            projectProperties.setSiteRootFolder("app"); // NOI18N
            projectProperties.setTestFolder("test"); // NOI18N
            projectProperties.setConfigFolder("config"); // NOI18N
        }

        @Override
        protected FileObject getTargetDir(FileObject projectDir, CreateProjectProperties projectProperties) {
            return projectDir;
        }
    }

Lines 44-50 Link Here

(-)a/web.client.samples/src/org/netbeans/modules/web/client/samples/BackboneHelloWorld.java (-3 / +3 lines)
44		44
45	import org.netbeans.api.templates.TemplateRegistration;	45	import org.netbeans.api.templates.TemplateRegistration;
46	import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSampleWizardIterator;	46	import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSampleWizardIterator;
47	import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation;	47	import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSiteTemplate;
48	import org.openide.util.NbBundle;	48	import org.openide.util.NbBundle;
49		49
50	/**	50	/**
Lines 64-71 Link Here
64	public class BackboneHelloWorld extends OnlineSampleWizardIterator {	64	public class BackboneHelloWorld extends OnlineSampleWizardIterator {
65		65
66	@Override	66	@Override
67	protected SiteTemplateImplementation getSiteTemplate() {	67	protected OnlineSiteTemplate getSiteTemplate() {
68	return new OnlineSiteTemplate("BACKBONE-HELLO-WORLD", getProjectName(), getProjectZipURL(), "hello-backbonejs-gh-pages.zip"); // NOI18N	68	return new OnlineSiteTemplate(getProjectName(), getProjectZipURL(), "hello-backbonejs-gh-pages.zip"); // NOI18N
69	}	69	}
70		70
71	@Override	71	@Override

Lines 44-50 Link Here

(-)a/web.client.samples/src/org/netbeans/modules/web/client/samples/BackboneJQueryMobile.java (-3 / +3 lines)
44		44
45	import org.netbeans.api.templates.TemplateRegistration;	45	import org.netbeans.api.templates.TemplateRegistration;
46	import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSampleWizardIterator;	46	import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSampleWizardIterator;
47	import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation;	47	import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSiteTemplate;
48	import org.openide.util.NbBundle;	48	import org.openide.util.NbBundle;
49		49
50	/**	50	/**
Lines 64-71 Link Here
64	public class BackboneJQueryMobile extends OnlineSampleWizardIterator {	64	public class BackboneJQueryMobile extends OnlineSampleWizardIterator {
65		65
66	@Override	66	@Override
67	protected SiteTemplateImplementation getSiteTemplate() {	67	protected OnlineSiteTemplate getSiteTemplate() {
68	return new OnlineSiteTemplate("BACKBONE-JQUERY-MOBILE", getProjectName(), getProjectZipURL(), "backbone-jquerymobile-master.zip"); // NOI18N	68	return new OnlineSiteTemplate(getProjectName(), getProjectZipURL(), "backbone-jquerymobile-master.zip"); // NOI18N
69	}	69	}
70		70
71	@Override	71	@Override





import org.netbeans.api.templates.TemplateRegistration;
import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSampleWizardIterator;
import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSiteTemplate;
import org.netbeans.modules.web.clientproject.createprojectapi.CreateProjectProperties;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;


public class BackboneWineCellar extends OnlineSampleWizardIterator {

    @Override
    protected OnlineSiteTemplate getSiteTemplate() {
        return new BackboneWineCellarTemplate(getProjectName(), getProjectZipURL(), "backbone-cellar-master.zip"); // NOI18N
    }

    @Override


    private static class BackboneWineCellarTemplate extends OnlineSiteTemplate {

        public BackboneWineCellarTemplate(String name, String url, String zipName) {
            super(name, url, zipName);
        }

        @Override
        public void configure(CreateProjectProperties projectProperties) {
            projectProperties.setSiteRootFolder("bootstrap"); // NOI18N
        }

        @Override
        protected FileObject getTargetDir(FileObject projectDir, CreateProjectProperties projectProperties) {
            return projectDir;
        }
    }

Lines 44-50 Link Here

(-)a/web.client.samples/src/org/netbeans/modules/web/client/samples/EmberJSTrek.java (-3 / +3 lines)
44		44
45	import org.netbeans.api.templates.TemplateRegistration;	45	import org.netbeans.api.templates.TemplateRegistration;
46	import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSampleWizardIterator;	46	import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSampleWizardIterator;
47	import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation;	47	import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSiteTemplate;
48	import org.openide.util.NbBundle;	48	import org.openide.util.NbBundle;
49		49
50	/**	50	/**
Lines 64-71 Link Here
64	public class EmberJSTrek extends OnlineSampleWizardIterator {	64	public class EmberJSTrek extends OnlineSampleWizardIterator {
65		65
66	@Override	66	@Override
67	protected SiteTemplateImplementation getSiteTemplate() {	67	protected OnlineSiteTemplate getSiteTemplate() {
68	return new OnlineSiteTemplate("EMBER-JS-TREK", getProjectName(), getProjectZipURL(), "trek-ember-tutorial-master.zip"); // NOI18N	68	return new OnlineSiteTemplate(getProjectName(), getProjectZipURL(), "trek-ember-tutorial-master.zip"); // NOI18N
69	}	69	}
70		70
71	@Override	71	@Override





import org.netbeans.api.templates.TemplateRegistration;
import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSampleWizardIterator;
import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSiteTemplate;
import org.netbeans.modules.web.clientproject.createprojectapi.CreateProjectProperties;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;


public class KnockoutJSGameList extends OnlineSampleWizardIterator {

    @Override
    protected OnlineSiteTemplate getSiteTemplate() {
        return new KnockoutJSGameListTemplate(getProjectName(), getProjectZipURL(), "KnockoutJS.Tips-master.zip"); // NOI18N
    }

    @Override


    private static class KnockoutJSGameListTemplate extends OnlineSiteTemplate {

        public KnockoutJSGameListTemplate(String name, String url, String zipName) {
            super(name, url, zipName);
        }

        @Override
        public void configure(CreateProjectProperties projectProperties) {
            projectProperties.setSiteRootFolder("src"); // NOI18N
        }

        @Override
        protected FileObject getTargetDir(FileObject projectDir, CreateProjectProperties projectProperties) {
            return projectDir;
        }
    }




import java.util.LinkedHashSet;
import java.util.Set;
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.web.client.samples.wizard.WizardConstants;
import org.netbeans.modules.web.client.samples.wizard.ui.OnlineSamplePanel;
import org.netbeans.modules.web.clientproject.createprojectapi.ClientSideProjectGenerator;
import org.netbeans.modules.web.clientproject.createprojectapi.CreateProjectProperties;
import org.netbeans.modules.web.clientproject.ClientSideProjectType;
import org.netbeans.modules.web.clientproject.sites.OnlineSites;
import org.netbeans.modules.web.clientproject.sites.SiteHelper;
import org.netbeans.modules.web.clientproject.spi.ClientProjectExtender;
import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation;
import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation.ProjectProperties;
import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.EditableProperties;
import org.netbeans.spi.project.support.ant.ProjectGenerator;
import org.netbeans.spi.project.ui.support.ProjectChooser;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;

import org.openide.WizardDescriptor.Panel;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;

/**
 *

    protected OnlineSampleWizardIterator() {
    }

    protected abstract OnlineSiteTemplate getSiteTemplate();
    protected abstract String getProjectName();
    protected abstract String getProjectZipURL();


    public static class OnlineSiteTemplate extends OnlineSites {

        public OnlineSiteTemplate(String id, String name, String url, String zipName) {
            this(id, name, "", url, zipName); // NOI18N
        }

        public OnlineSiteTemplate(String id, String name, String description, String url, String zipName) {
            super(id, name, description, url, new File(SiteHelper.getJsLibsDirectory(), zipName));
        }
    }


    @Override
    protected Panel[] createPanels(WizardDescriptor wizard) {
        wizard.putProperty(WizardConstants.SAMPLE_PROJECT_NAME, getProjectName());

     */

    @NbBundle.Messages({
        "OnlineSampleWizardIterator.creatingProject=Creating project...",
        "OnlineSampleWizardIterator.applyingTemplate=Applying template..."
    })
    @Override
    public Set instantiate(ProgressHandle handle) throws IOException {

        }
        final FileObject projectDirFO = FileUtil.toFileObject(projectDir);

        CreateProjectProperties props = new CreateProjectProperties();
        props.setProjectDir(projectDirFO);
        props.setProjectName(name);
        props.setStartFile(getStartFile());

        OnlineSiteTemplate siteTemplate = getSiteTemplate();
        if (siteTemplate != null) {
            siteTemplate.configure(props);
        }

        Project project = ClientSideProjectGenerator.createProject(props);

        // Always open top dir as a project:
        files.add(projectDirFO);

        if (siteTemplate != null) {
            handle.progress(Bundle.OnlineSampleWizardIterator_applyingTemplate());
            applySiteTemplate(project.getProjectDirectory(), props, siteTemplate, handle);
        }

        FileObject siteRoot = project.getProjectDirectory().getFileObject(props.getSiteRootFolder());
        assert siteRoot != null;
        FileObject startFile = siteRoot.getFileObject(props.getStartFile()); // NOI18N
        projectHelper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, properties);

        FileObject siteRoot = instantiate(handle, descriptor, project);

        // start file
        FileObject startFile = siteRoot.getFileObject(getStartFile()); // NOI18N
        if (startFile != null) {
            files.add(startFile);
        }

        return "index.html";
    }

    private void setProjectName(final AntProjectHelper projectHelper, final String name) {
        ProjectManager.mutex().writeAccess(new Runnable() {
            @Override
            public void run() {
                Element data = projectHelper.getPrimaryConfigurationData(true);
                Document document = data.getOwnerDocument();
                NodeList nameList = data.getElementsByTagNameNS(ClientSideProjectType.PROJECT_CONFIGURATION_NAMESPACE, "name"); // NOI18N
                Element nameElement;
                if (nameList.getLength() == 1) {
                    nameElement = (Element) nameList.item(0);
                    NodeList deadKids = nameElement.getChildNodes();
                    while (deadKids.getLength() > 0) {
                        nameElement.removeChild(deadKids.item(0));
                    }
                } else {
                    nameElement = document.createElementNS(ClientSideProjectType.PROJECT_CONFIGURATION_NAMESPACE, "name"); // NOI18N
                    data.insertBefore(nameElement, data.getChildNodes().item(0));
                }
                nameElement.appendChild(document.createTextNode(name));
                projectHelper.putPrimaryConfigurationData(data, true);
            }
        });
    }

    @NbBundle.Messages({
        "OnlineSampleWizardIterator.applyingTemplate=Applying template..."
    })
    private FileObject instantiate(ProgressHandle handle, WizardDescriptor wizardDescriptor, ClientSideProject project) throws IOException {
        AntProjectHelper projectHelper = project.getProjectHelper();
        SiteTemplateImplementation siteTemplate = getSiteTemplate();

        ProjectProperties projectProperties = new ProjectProperties();
        projectProperties.setSiteRootFolder(ClientSideProjectConstants.DEFAULT_SITE_ROOT_FOLDER);
        projectProperties.setTestFolder(ClientSideProjectConstants.DEFAULT_TEST_FOLDER);
        projectProperties.setConfigFolder(ClientSideProjectConstants.DEFAULT_CONFIG_FOLDER);

        if (siteTemplate != null) {
            siteTemplate.configure(projectProperties);
            initProject(project, projectProperties);

            handle.progress(Bundle.OnlineSampleWizardIterator_applyingTemplate());
            applySiteTemplate(projectHelper.getProjectDirectory(), projectProperties, siteTemplate, handle);
        } else {
            // init standard project
            initProject(project, projectProperties);
        }

        // get application dir:
        FileObject siteRootDir = project.getSiteRootFolder();
        assert siteRootDir != null;

        // apply extenders
        //no extenders for online samples
//        for (ClientProjectExtender extender : Lookup.getDefault().lookupAll(ClientProjectExtender.class)) {
//            extender.apply(project.getProjectDirectory(), siteRootDir, (String) wizardDescriptor.getProperty(LIBRARIES_PATH));
//        }

        return siteRootDir;
    }

    private void initProject(ClientSideProject project, SiteTemplateImplementation.ProjectProperties properties) throws IOException {
        ClientSideProjectUtilities.initializeProject(project,
                properties.getSiteRootFolder(),
                properties.getTestFolder(),
                properties.getConfigFolder());
    }

    @NbBundle.Messages({
        "# {0} - template name",
        "OnlineSampleWizardIterator.error.applyingSiteTemplate=Cannot apply template \"{0}\"."
    })
    private void applySiteTemplate(
            final FileObject projectDir,
            final CreateProjectProperties props,
            final OnlineSiteTemplate siteTemplate,
            final ProgressHandle handle) {

        assert !EventQueue.isDispatchThread();
        final String templateName = siteTemplate.getName();
        try {
            siteTemplate.apply(projectDir, props, handle);
        } catch (IOException ex) {
            errorOccured(Bundle.OnlineSampleWizardIterator_error_applyingSiteTemplate(templateName));
        }




 *
 * Portions Copyrighted 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.web.client.samples.wizard.iterator;

import org.netbeans.modules.web.clientproject.api.sites.SiteHelper;
import java.awt.EventQueue;
import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.logging.Logger;
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.modules.web.clientproject.api.network.NetworkException;
import org.netbeans.modules.web.clientproject.api.network.NetworkSupport;
import org.netbeans.modules.web.clientproject.createprojectapi.CreateProjectProperties;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;
import org.openide.util.lookup.ServiceProvider;


public class OnlineSiteTemplate {

    private static final Logger LOGGER = Logger.getLogger(OnlineSiteTemplate.class.getName());

    private final String name;
    private final String url;
    private final File libFile;
    private final String description;
    private final String id;

    public OnlineSiteTemplate(String name, String url, String zipName) {

    protected OnlineSites(String id, String name, String description, String url, File libFile) {
        this.id = id;
        this.name = name;
        this.description = description;
        this.url = url;
        this.libFile = new File(SiteHelper.getJsLibsDirectory(), zipName);
    }

    @Override
    public String getId() {
        return id;
    }

    @Override
    public String getName() {
        return name;
    }

    @Override
    public String getDescription() {
        return description;
    }

    @Override
    public boolean isPrepared() {
        return libFile.isFile();
    }

    public void prepare() throws NetworkException, IOException, InterruptedException {
    public void prepare() throws IOException {
        assert !EventQueue.isDispatchThread();
        assert !isPrepared();
        NetworkSupport.download(url, libFile);
    }

    public void configure(CreateProjectProperties projectProperties) {
    public void configure(ProjectProperties projectProperties) {
        // noop by default
    }

    public final void apply(FileObject projectDir, CreateProjectProperties projectProperties, ProgressHandle handle) throws IOException {
    public final void apply(FileObject projectDir, ProjectProperties projectProperties, ProgressHandle handle) throws IOException {
        assert !EventQueue.isDispatchThread();
        if (!isPrepared()) {
            // not correctly prepared, user has to know about it already

        SiteHelper.unzipProjectTemplate(getTargetDir(projectDir, projectProperties), libFile, handle);
    }

    protected FileObject getTargetDir(FileObject projectDir, CreateProjectProperties projectProperties) {
        // by default, extract template to site root
        return projectDir.getFileObject(projectProperties.getSiteRootFolder());
    }

    @Override
    public Collection<String> supportedLibraries() {
        return SiteHelper.stripRootFolder(FileUtilities.listJsFilesFromZipFile(libFile));
    }

    //~ Inner classes

    @ServiceProvider(service=SiteTemplateImplementation.class, position=150)
    public static class SiteAngularJsSeed extends OnlineSites {

        private static final String SITE_ROOT_FOLDER = "app"; // NOI18N
        private static final String TEST_FOLDER = "test"; // NOI18N
        private static final String CONFIG_FOLDER = "config"; // NOI18N


        @NbBundle.Messages({"SiteAngularJsSeed.name=AngularJS Seed",
                "SiteAngularJsSeed.description=Site template for AngularJS projects."})
        public SiteAngularJsSeed() {
            super("ANGULAR", Bundle.SiteAngularJsSeed_name(), Bundle.SiteAngularJsSeed_description(), // NOI18N
                    "https://github.com/angular/angular-seed/zipball/master", // NOI18N
                    new File(SiteHelper.getJsLibsDirectory(), "angularjs-seed.zip")); // NOI18N
        }

        @Override
        public void configure(ProjectProperties projectProperties) {
            projectProperties.setSiteRootFolder(SITE_ROOT_FOLDER)
                    .setTestFolder(TEST_FOLDER)
                    .setConfigFolder(CONFIG_FOLDER);
        }

        @Override
        protected FileObject getTargetDir(FileObject projectDir, ProjectProperties projectProperties) {
            return projectDir;
        }

    }

    @NbBundle.Messages("SiteInitializr.description=Site template from initializr.com.")
    @ServiceProvider(service=SiteTemplateImplementation.class, position=200)
    public static class BootstrapSiteInitializr extends OnlineSites {

        @NbBundle.Messages("BootstrapSiteInitializr.name=Initializr: Bootstrap")
        public BootstrapSiteInitializr() {
            super("BOOTSTRAP", Bundle.BootstrapSiteInitializr_name(), // NOI18N
                    Bundle.SiteInitializr_description(),
                    "http://www.initializr.com/builder?boot-hero&jquerydev&h5bp-iecond&h5bp-chromeframe&h5bp-analytics&h5bp-favicon&h5bp-appletouchicons&modernizrrespond&izr-emptyscript&boot-css&boot-scripts", // NOI18N
                    new File(SiteHelper.getJsLibsDirectory(), "initializr-bootstrap-latest.zip")); // NOI18N
        }

    }

    @ServiceProvider(service=SiteTemplateImplementation.class, position=210)
    public static class ClassicSiteInitializr extends OnlineSites {

        @NbBundle.Messages("ClassicSiteInitializr.name=Initializr: Classic")
        public ClassicSiteInitializr() {
            super("INIT.CLASSIC", Bundle.ClassicSiteInitializr_name(), // NOI18N
                Bundle.SiteInitializr_description(),
                "http://www.initializr.com/builder?h5bp-content&modernizr&jquerydev&h5bp-iecond&h5bp-chromeframe&h5bp-analytics&h5bp-htaccess&h5bp-favicon&h5bp-appletouchicons&h5bp-scripts&h5bp-robots&h5bp-humans&h5bp-404&h5bp-adobecrossdomain&h5bp-css&h5bp-csshelpers&h5bp-mediaqueryprint&h5bp-mediaqueries", // NOI18N
                    new File(SiteHelper.getJsLibsDirectory(), "initializr-classic-latest.zip")); // NOI18N
        }

    }

    @ServiceProvider(service=SiteTemplateImplementation.class, position=220)
    public static class ResponsiveSiteInitializr extends OnlineSites {

        @NbBundle.Messages("ResponsiveSiteInitializr.name=Initializr: Responsive")
        public ResponsiveSiteInitializr() {
            super("INIT.RESP", Bundle.ResponsiveSiteInitializr_name(), // NOI18N
                    Bundle.SiteInitializr_description(),
                    "http://www.initializr.com/builder?izr-responsive&jquerydev&h5bp-iecond&h5bp-chromeframe&h5bp-analytics&h5bp-favicon&h5bp-appletouchicons&modernizrrespond&h5bp-css&h5bp-csshelpers&h5bp-mediaqueryprint&izr-emptyscript", // NOI18N
                    new File(SiteHelper.getJsLibsDirectory(), "initializr-responsive-latest.zip")); // NOI18N
        }

    }

    @ServiceProvider(service=SiteTemplateImplementation.class, position=300)
    public static class SiteHtml5BoilerplateV4 extends OnlineSites {

        @NbBundle.Messages({"SiteHtml5BoilerplateV4.name=HTML5 Boilerplate v4.0.0",
                "SiteHtml5BoilerplateV4.description=Site template from html5boilerplate.com. Version: 4.0.0"})
        public SiteHtml5BoilerplateV4() {
            super("INIT.BOILER4", Bundle.SiteHtml5BoilerplateV4_name(), Bundle.SiteHtml5BoilerplateV4_description(), // NOI18N
                    "https://github.com/h5bp/html5-boilerplate/zipball/v4.0.0", // NOI18N
                    new File(SiteHelper.getJsLibsDirectory(), "html5-boilerplate-400.zip")); // NOI18N
        }

    }

    @ServiceProvider(service=SiteTemplateImplementation.class, position=320)
    public static class SiteHtml5BoilerplateV3 extends OnlineSites {

        @NbBundle.Messages({"SiteHtml5Boilerplate.name=HTML5 Boilerplate v3.0.2",
                "SiteHtml5Boilerplate.description=Site template from html5boilerplate.com. Version: 3.0.2"})
        public SiteHtml5BoilerplateV3() {
            super("INIT.BOILER3", Bundle.SiteHtml5Boilerplate_name(), Bundle.SiteHtml5Boilerplate_description(), // NOI18N
                    "https://github.com/h5bp/html5-boilerplate/zipball/v3.0.2", // NOI18N
                    new File(SiteHelper.getJsLibsDirectory(), "html5-boilerplate-302.zip")); // NOI18N
        }

    }

    @ServiceProvider(service=SiteTemplateImplementation.class, position=400)
    public static class SiteTwitterBootstrap extends OnlineSites {

        @NbBundle.Messages({"SiteTwitterBootstrap.name=Twitter Bootstrap",
                "SiteTwitterBootstrap.description=Site template from twitter.github.com/bootstrap"})
        public SiteTwitterBootstrap() {
            super("TWITTER", Bundle.SiteTwitterBootstrap_name(), Bundle.SiteTwitterBootstrap_description(), // NOI18N
                    "http://twitter.github.com/bootstrap/assets/bootstrap.zip", // NOI18N
                    new File(SiteHelper.getJsLibsDirectory(), "twitter-bootstrap.zip")); // NOI18N
        }

    }

}

Lines 44-50 Link Here

(-)a/web.client.samples/src/org/netbeans/modules/web/client/samples/wizard/iterator/SampleWizardIterator.java (-1 lines)
44		44
45	import java.io.BufferedReader;	45	import java.io.BufferedReader;
46	import java.io.FileInputStream;	46	import java.io.FileInputStream;
47	import java.io.FileReader;
48	import java.io.IOException;	47	import java.io.IOException;
49	import java.io.InputStream;	48	import java.io.InputStream;
50	import java.io.InputStreamReader;	49	import java.io.InputStreamReader;




import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;
import org.netbeans.modules.web.client.samples.wizard.WizardConstants;
import org.netbeans.modules.web.client.samples.wizard.iterator.OnlineSiteTemplate;
import org.netbeans.modules.web.clientproject.api.network.NetworkException;
import org.netbeans.modules.web.clientproject.api.network.NetworkSupport;
import org.netbeans.modules.web.clientproject.api.util.ValidationUtilities;
import org.netbeans.modules.web.clientproject.util.ValidationUtilities;
import org.netbeans.spi.project.ui.support.ProjectChooser;
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileChooserBuilder;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

/**

    public String prepareTemplate() {
        assert !EventQueue.isDispatchThread();

        final OnlineSiteTemplate siteTemplate = (OnlineSiteTemplate) descriptor.getProperty(WizardConstants.SAMPLE_TEMPLATE);
        final String templateName = siteTemplate.getName();

        if (siteTemplate.isPrepared()) {

                    if (!NetworkSupport.showNetworkErrorDialog(ex.getFailedRequests())) {
                        return Bundle.SiteTemplateWizard_error_preparing(templateName);
                    }
                } catch (InterruptedException ex) {
                    return Bundle.SiteTemplateWizard_error_preparing(templateName);
                }
            }
        } catch (IOException ex) {

Lines 1-5 Link Here

(-)a/web.clientproject.api/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.web.clientproject.api	2	OpenIDE-Module: org.netbeans.modules.web.clientproject.api
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/api/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/api/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.36	4	OpenIDE-Module-Specification-Version: 1.37
5		5

Lines 208-213 Link Here

(-)a/web.clientproject.api/nbproject/project.xml (+1 lines)
208	<package>org.netbeans.modules.web.clientproject.api.network</package>	208	<package>org.netbeans.modules.web.clientproject.api.network</package>
209	<package>org.netbeans.modules.web.clientproject.api.util</package>	209	<package>org.netbeans.modules.web.clientproject.api.util</package>
210	<package>org.netbeans.modules.web.clientproject.api.validation</package>	210	<package>org.netbeans.modules.web.clientproject.api.validation</package>
		211	<package>org.netbeans.modules.web.clientproject.api.sites</package>
211	<package>org.netbeans.modules.web.clientproject.spi</package>	212	<package>org.netbeans.modules.web.clientproject.spi</package>
212	<package>org.netbeans.modules.web.clientproject.spi.platform</package>	213	<package>org.netbeans.modules.web.clientproject.spi.platform</package>
213	</friend-packages>	214	</friend-packages>

Lines 39-45 Link Here

(-)a/web.clientproject/src/org/netbeans/modules/web/clientproject/sites/SiteHelper.java (-1 / +1 lines)
39	*	39	*
40	* Portions Copyrighted 2012 Sun Microsystems, Inc.	40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
41	*/	41	*/
42	package org.netbeans.modules.web.clientproject.sites;	42	package org.netbeans.modules.web.clientproject.api.sites;
43		43
44	import java.awt.EventQueue;	44	import java.awt.EventQueue;
45	import java.io.File;	45	import java.io.File;

Lines 39-45 Link Here

(-)a/web.clientproject/src/org/netbeans/modules/web/clientproject/util/ValidationUtilities.java (-1 / +1 lines)
39	*	39	*
40	* Portions Copyrighted 2012 Sun Microsystems, Inc.	40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
41	*/	41	*/
42	package org.netbeans.modules.web.clientproject.util;	42	package org.netbeans.modules.web.clientproject.api.util;
43		43
44	import java.io.File;	44	import java.io.File;
45		45

Lines 300-310 Link Here

(-)a/web.clientproject/nbproject/project.xml (-5 / +1 lines)
300	</test-dependencies>	300	</test-dependencies>
301	<friend-packages>	301	<friend-packages>
302	<friend>org.netbeans.modules.web.client.samples</friend>	302	<friend>org.netbeans.modules.web.client.samples</friend>
303	<package>org.netbeans.modules.web.clientproject</package>	303	<package>org.netbeans.modules.web.clientproject.createprojectapi</package>
304	<package>org.netbeans.modules.web.clientproject.sites</package>
305	<package>org.netbeans.modules.web.clientproject.util</package>
306	<!-- the exported API is going to be removed soon:
307	see issue "222525 - Get rid of the web.clientproject exported API" -->
308	</friend-packages>	304	</friend-packages>
309	</data>	305	</data>
310	</configuration>	306	</configuration>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
 */
package org.netbeans.modules.web.clientproject.createprojectapi;

import java.io.IOException;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.modules.web.clientproject.ClientSideProject;
import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation.ProjectProperties;
import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

public final class ClientSideProjectGenerator {

    private ClientSideProjectGenerator() {
    }

    /**
     * Creates a new empty Web Client Side project according to the given {@link ProjectProperties}.
     *
     * @param properties used for project setup
     * @return project
     * @throws IOException in case something went wrong
     */
    public static Project createProject(@NonNull CreateProjectProperties properties) throws IOException {
        AntProjectHelper h = ClientSideProjectUtilities.setupProject(properties.getProjectDir(), properties.getProjectName());
        ClientSideProject p = (ClientSideProject)FileOwnerQuery.getOwner(h.getProjectDirectory());
        ClientSideProjectUtilities.initializeProject(p,
                    properties.getSiteRootFolder(),
                    properties.getTestFolder(),
                    properties.getConfigFolder());
        return p;
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
 */
package org.netbeans.modules.web.clientproject.createprojectapi;

import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.modules.web.clientproject.ClientSideProjectConstants;
import org.openide.filesystems.FileObject;
import org.openide.util.Parameters;

public final class CreateProjectProperties {

    private FileObject projectDir;
    private String projectName;
    private String startFile;
    private String siteRootFolder;
    private String testFolder;
    private String configFolder;
    private String encoding;

    public CreateProjectProperties() {
        setSiteRootFolder(ClientSideProjectConstants.DEFAULT_SITE_ROOT_FOLDER);
        setTestFolder(ClientSideProjectConstants.DEFAULT_TEST_FOLDER);
        setConfigFolder(ClientSideProjectConstants.DEFAULT_CONFIG_FOLDER);
    }

    /**
     * Get project directory, usually relative path.
     *
     * @return project directory, usually relative path; never returns
     * {@code null} or empty string
     */
    @NonNull
    public FileObject getProjectDir() {
        return projectDir;
    }

    /**
     * Set project directory, never {@code null} or empty string.
     *
     * @param projectDir project directory, never {@code null} or empty string
     * @return itself
     */
    public CreateProjectProperties setProjectDir(FileObject projectDir) {
        this.projectDir = projectDir;
        return this;
    }

    /**
     * Get project name.
     *
     * @return project name; never returns {@code null} or empty string
     */
    @NonNull
    public String getProjectName() {
        return projectName;
    }

    /**
     * Set project name, never {@code null} or empty string.
     *
     * @param projectName project name, never {@code null} or empty string
     * @return itself
     */
    public CreateProjectProperties setProjectName(String projectName) {
        this.projectName = projectName;
        return this;
    }

    /**
     * Get start file.
     *
     * @return start file; never returns {@code null} or empty string
     */
    @NonNull
    public String getStartFile() {
        return startFile;
    }

    /**
     * Set start file, never {@code null} or empty string.
     *
     * @param startFile start file, never {@code null} or empty string
     * @return itself
     */
    public CreateProjectProperties setStartFile(String startFile) {
        this.startFile = startFile;
        return this;
    }

    /**
     * Get Site Root folder, usually relative path.
     *
     * @return Site Root folder, usually relative path; never returns
     * {@code null} or empty string
     */
    @NonNull
    public String getSiteRootFolder() {
        return siteRootFolder;
    }

    /**
     * Set Site Root folder, never {@code null} or empty string.
     *
     * @param siteRootFolder Site Root folder, never {@code null} or empty
     * string
     * @return itself
     */
    public CreateProjectProperties setSiteRootFolder(@NonNull String siteRootFolder) {
        Parameters.notEmpty("siteRootFolder", siteRootFolder);
        this.siteRootFolder = siteRootFolder;
        return this;
    }

    /**
     * Get Test folder, usually relative path.
     *
     * @return Test folder, usually relative path; can be {@code null} if no
     * Test folder is present
     */
    @CheckForNull
    public String getTestFolder() {
        return testFolder;
    }

    /**
     * Set Test folder, can be {@code null} if there are no tests available.
     *
     * @param testFolder Test folder, can be {@code null} if there are no tests
     * available
     * @return itself
     */
    public CreateProjectProperties setTestFolder(String testFolder) {
        this.testFolder = testFolder;
        return this;
    }

    /**
     * Get Config folder, usually relative path.
     *
     * @return Config folder, usually relative path; can be {@code null} if no
     * Config folder is present
     */
    @CheckForNull
    public String getConfigFolder() {
        return configFolder;
    }

    /**
     * Set Config folder, can be {@code null} if there is no config available.
     *
     * @param configFolder Config folder, can be {@code null} if there is no
     * config available
     * @return itself
     */
    public CreateProjectProperties setConfigFolder(String configFolder) {
        this.configFolder = configFolder;
        return this;
    }

    /**
     * Get encoding.
     *
     * @return Encoding; can be {@code null} if no encoding is present
     */
    @NonNull
    public String getEncoding() {
        return encoding;
    }

    /**
     * Set encoding, can be {@code null} if there is no encoding available.
     *
     * @param encoding encoding, can be {@code null} if there is no encoding
     * available
     * @return itself
     */
    public CreateProjectProperties setEncoding(String encoding) {
        this.encoding = encoding;
        return this;
    }
}

Lines 41-46 Link Here

(-)a/web.clientproject/src/org/netbeans/modules/web/clientproject/sites/OnlineSites.java (+1 lines)
41	*/	41	*/
42	package org.netbeans.modules.web.clientproject.sites;	42	package org.netbeans.modules.web.clientproject.sites;
43		43
		44	import org.netbeans.modules.web.clientproject.api.sites.SiteHelper;
44	import java.awt.EventQueue;	45	import java.awt.EventQueue;
45	import java.io.File;	46	import java.io.File;
46	import java.io.IOException;	47	import java.io.IOException;

Lines 41-46 Link Here

(-)a/web.clientproject/src/org/netbeans/modules/web/clientproject/sites/SiteMobileBoilerplate.java (+1 lines)
41	*/	41	*/
42	package org.netbeans.modules.web.clientproject.sites;	42	package org.netbeans.modules.web.clientproject.sites;
43		43
		44	import org.netbeans.modules.web.clientproject.api.sites.SiteHelper;
44	import java.awt.EventQueue;	45	import java.awt.EventQueue;
45	import java.io.File;	46	import java.io.File;
46	import java.io.IOException;	47	import java.io.IOException;

Lines 41-46 Link Here

(-)a/web.clientproject/src/org/netbeans/modules/web/clientproject/sites/SiteZip.java (+1 lines)
41	*/	41	*/
42	package org.netbeans.modules.web.clientproject.sites;	42	package org.netbeans.modules.web.clientproject.sites;
43		43
		44	import org.netbeans.modules.web.clientproject.api.sites.SiteHelper;
44	import java.awt.EventQueue;	45	import java.awt.EventQueue;
45	import java.io.File;	46	import java.io.File;
46	import java.io.IOException;	47	import java.io.IOException;

Lines 58-64 Link Here

(-)a/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/ExistingClientSideProject.java (-1 / +1 lines)
58	import javax.swing.event.DocumentEvent;	58	import javax.swing.event.DocumentEvent;
59	import javax.swing.event.DocumentListener;	59	import javax.swing.event.DocumentListener;
60	import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;	60	import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
61	import org.netbeans.modules.web.clientproject.util.ValidationUtilities;	61	import org.netbeans.modules.web.clientproject.api.util.ValidationUtilities;
62	import org.openide.awt.Mnemonics;	62	import org.openide.awt.Mnemonics;
63	import org.openide.filesystems.FileChooserBuilder;	63	import org.openide.filesystems.FileChooserBuilder;
64	import org.openide.filesystems.FileUtil;	64	import org.openide.filesystems.FileUtil;

Lines 47-53 Link Here

(-)a/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/NewClientSideProject.java (-1 / +1 lines)
47	import javax.swing.event.DocumentEvent;	47	import javax.swing.event.DocumentEvent;
48	import javax.swing.event.DocumentListener;	48	import javax.swing.event.DocumentListener;
49	import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;	49	import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
50	import org.netbeans.modules.web.clientproject.util.ValidationUtilities;	50	import org.netbeans.modules.web.clientproject.api.util.ValidationUtilities;
51	import org.netbeans.spi.project.ui.support.ProjectChooser;	51	import org.netbeans.spi.project.ui.support.ProjectChooser;
52	import org.openide.filesystems.FileChooserBuilder;	52	import org.openide.filesystems.FileChooserBuilder;
53	import org.openide.filesystems.FileUtil;	53	import org.openide.filesystems.FileUtil;

Return to bug 222525

Lines 48-69 Link Here

(-)a/web.client.samples/src/org/netbeans/modules/web/client/samples/wizard/iterator/OnlineSampleWizardIterator.java (-114 / +27 lines)
48	import java.util.LinkedHashSet;	48	import java.util.LinkedHashSet;
49	import java.util.Set;	49	import java.util.Set;
50	import org.netbeans.api.progress.ProgressHandle;	50	import org.netbeans.api.progress.ProgressHandle;
51	import org.netbeans.api.project.FileOwnerQuery;	51	import org.netbeans.api.project.Project;
52	import org.netbeans.api.project.ProjectManager;
53	import org.netbeans.modules.web.client.samples.wizard.WizardConstants;	52	import org.netbeans.modules.web.client.samples.wizard.WizardConstants;
54	import org.netbeans.modules.web.client.samples.wizard.ui.OnlineSamplePanel;	53	import org.netbeans.modules.web.client.samples.wizard.ui.OnlineSamplePanel;
55	import org.netbeans.modules.web.clientproject.ClientSideProject;	54	import org.netbeans.modules.web.clientproject.createprojectapi.ClientSideProjectGenerator;
56	import org.netbeans.modules.web.clientproject.ClientSideProjectConstants;	55	import org.netbeans.modules.web.clientproject.createprojectapi.CreateProjectProperties;
57	import org.netbeans.modules.web.clientproject.ClientSideProjectType;
58	import org.netbeans.modules.web.clientproject.sites.OnlineSites;
59	import org.netbeans.modules.web.clientproject.sites.SiteHelper;
60	import org.netbeans.modules.web.clientproject.spi.ClientProjectExtender;
61	import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation;
62	import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation.ProjectProperties;
63	import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
64	import org.netbeans.spi.project.support.ant.AntProjectHelper;
65	import org.netbeans.spi.project.support.ant.EditableProperties;
66	import org.netbeans.spi.project.support.ant.ProjectGenerator;
67	import org.netbeans.spi.project.ui.support.ProjectChooser;	56	import org.netbeans.spi.project.ui.support.ProjectChooser;
68	import org.openide.DialogDisplayer;	57	import org.openide.DialogDisplayer;
69	import org.openide.NotifyDescriptor;	58	import org.openide.NotifyDescriptor;
Lines 71-81 Link Here
71	import org.openide.WizardDescriptor.Panel;	60	import org.openide.WizardDescriptor.Panel;
72	import org.openide.filesystems.FileObject;	61	import org.openide.filesystems.FileObject;
73	import org.openide.filesystems.FileUtil;	62	import org.openide.filesystems.FileUtil;
74	import org.openide.util.Lookup;
75	import org.openide.util.NbBundle;	63	import org.openide.util.NbBundle;
76	import org.w3c.dom.Document;
77	import org.w3c.dom.Element;
78	import org.w3c.dom.NodeList;
79		64
80	/**	65	/**
81	*	66	*
Lines 89-111 Link Here
89	protected OnlineSampleWizardIterator() {	74	protected OnlineSampleWizardIterator() {
90	}	75	}
91		76
92	protected abstract SiteTemplateImplementation getSiteTemplate();	77	protected abstract OnlineSiteTemplate getSiteTemplate();
93	protected abstract String getProjectName();	78	protected abstract String getProjectName();
94	protected abstract String getProjectZipURL();	79	protected abstract String getProjectZipURL();
95		80
96		81
97	public static class OnlineSiteTemplate extends OnlineSites {
98
99	public OnlineSiteTemplate(String id, String name, String url, String zipName) {
100	this(id, name, "", url, zipName); // NOI18N
101	}
102
103	public OnlineSiteTemplate(String id, String name, String description, String url, String zipName) {
104	super(id, name, description, url, new File(SiteHelper.getJsLibsDirectory(), zipName));
105	}
106	}
107
108
109	@Override	82	@Override
110	protected Panel[] createPanels(WizardDescriptor wizard) {	83	protected Panel[] createPanels(WizardDescriptor wizard) {
111	wizard.putProperty(WizardConstants.SAMPLE_PROJECT_NAME, getProjectName());	84	wizard.putProperty(WizardConstants.SAMPLE_PROJECT_NAME, getProjectName());
Lines 132-138 Link Here
132	*/	105	*/
133		106
134	@NbBundle.Messages({	107	@NbBundle.Messages({
135	"OnlineSampleWizardIterator.creatingProject=Creating project..."	108	"OnlineSampleWizardIterator.creatingProject=Creating project...",
		109	"OnlineSampleWizardIterator.applyingTemplate=Applying template..."
136	})	110	})
137	@Override	111	@Override
138	public Set instantiate(ProgressHandle handle) throws IOException {	112	public Set instantiate(ProgressHandle handle) throws IOException {
Lines 148-170 Link Here
148	}	122	}
149	final FileObject projectDirFO = FileUtil.toFileObject(projectDir);	123	final FileObject projectDirFO = FileUtil.toFileObject(projectDir);
150		124
151	AntProjectHelper projectHelper = ProjectGenerator.createProject(projectDirFO, ClientSideProjectType.TYPE);	125	CreateProjectProperties props = new CreateProjectProperties();
152	setProjectName(projectHelper, name);	126	props.setProjectDir(projectDirFO);
		127	props.setProjectName(name);
		128	props.setStartFile(getStartFile());
		129
		130	OnlineSiteTemplate siteTemplate = getSiteTemplate();
		131	if (siteTemplate != null) {
		132	siteTemplate.configure(props);
		133	}
		134
		135	Project project = ClientSideProjectGenerator.createProject(props);
153		136
154	// Always open top dir as a project:	137	// Always open top dir as a project:
155	files.add(projectDirFO);	138	files.add(projectDirFO);
156		139
157	ClientSideProject project = (ClientSideProject) FileOwnerQuery.getOwner(projectHelper.getProjectDirectory());	140	if (siteTemplate != null) {
		141	handle.progress(Bundle.OnlineSampleWizardIterator_applyingTemplate());
		142	applySiteTemplate(project.getProjectDirectory(), props, siteTemplate, handle);
		143	}
158		144
159	// Setting start file	145	FileObject siteRoot = project.getProjectDirectory().getFileObject(props.getSiteRootFolder());
160	EditableProperties properties = projectHelper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);	146	assert siteRoot != null;
161	properties.put(ClientSideProjectConstants.PROJECT_START_FILE, getStartFile());	147	FileObject startFile = siteRoot.getFileObject(props.getStartFile()); // NOI18N
162	projectHelper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, properties);
163
164	FileObject siteRoot = instantiate(handle, descriptor, project);
165
166	// start file
167	FileObject startFile = siteRoot.getFileObject(getStartFile()); // NOI18N
168	if (startFile != null) {	148	if (startFile != null) {
169	files.add(startFile);	149	files.add(startFile);
170	}	150	}
Lines 182-268 Link Here
182	return "index.html";	162	return "index.html";
183	}	163	}
184		164
185	private void setProjectName(final AntProjectHelper projectHelper, final String name) {
186	ProjectManager.mutex().writeAccess(new Runnable() {
187	@Override
188	public void run() {
189	Element data = projectHelper.getPrimaryConfigurationData(true);
190	Document document = data.getOwnerDocument();
191	NodeList nameList = data.getElementsByTagNameNS(ClientSideProjectType.PROJECT_CONFIGURATION_NAMESPACE, "name"); // NOI18N
192	Element nameElement;
193	if (nameList.getLength() == 1) {
194	nameElement = (Element) nameList.item(0);
195	NodeList deadKids = nameElement.getChildNodes();
196	while (deadKids.getLength() > 0) {
197	nameElement.removeChild(deadKids.item(0));
198	}
199	} else {
200	nameElement = document.createElementNS(ClientSideProjectType.PROJECT_CONFIGURATION_NAMESPACE, "name"); // NOI18N
201	data.insertBefore(nameElement, data.getChildNodes().item(0));
202	}
203	nameElement.appendChild(document.createTextNode(name));
204	projectHelper.putPrimaryConfigurationData(data, true);
205	}
206	});
207	}
208
209	@NbBundle.Messages({
210	"OnlineSampleWizardIterator.applyingTemplate=Applying template..."
211	})
212	private FileObject instantiate(ProgressHandle handle, WizardDescriptor wizardDescriptor, ClientSideProject project) throws IOException {
213	AntProjectHelper projectHelper = project.getProjectHelper();
214	SiteTemplateImplementation siteTemplate = getSiteTemplate();
215
216	ProjectProperties projectProperties = new ProjectProperties();
217	projectProperties.setSiteRootFolder(ClientSideProjectConstants.DEFAULT_SITE_ROOT_FOLDER);
218	projectProperties.setTestFolder(ClientSideProjectConstants.DEFAULT_TEST_FOLDER);
219	projectProperties.setConfigFolder(ClientSideProjectConstants.DEFAULT_CONFIG_FOLDER);
220
221	if (siteTemplate != null) {
222	siteTemplate.configure(projectProperties);
223	initProject(project, projectProperties);
224
225	handle.progress(Bundle.OnlineSampleWizardIterator_applyingTemplate());
226	applySiteTemplate(projectHelper.getProjectDirectory(), projectProperties, siteTemplate, handle);
227	} else {
228	// init standard project
229	initProject(project, projectProperties);
230	}
231
232	// get application dir:
233	FileObject siteRootDir = project.getSiteRootFolder();
234	assert siteRootDir != null;
235
236	// apply extenders
237	//no extenders for online samples
238	// for (ClientProjectExtender extender : Lookup.getDefault().lookupAll(ClientProjectExtender.class)) {
239	// extender.apply(project.getProjectDirectory(), siteRootDir, (String) wizardDescriptor.getProperty(LIBRARIES_PATH));
240	// }
241
242	return siteRootDir;
243	}
244
245	private void initProject(ClientSideProject project, SiteTemplateImplementation.ProjectProperties properties) throws IOException {
246	ClientSideProjectUtilities.initializeProject(project,
247	properties.getSiteRootFolder(),
248	properties.getTestFolder(),
249	properties.getConfigFolder());
250	}
251
252	@NbBundle.Messages({	165	@NbBundle.Messages({
253	"# {0} - template name",	166	"# {0} - template name",
254	"OnlineSampleWizardIterator.error.applyingSiteTemplate=Cannot apply template \"{0}\"."	167	"OnlineSampleWizardIterator.error.applyingSiteTemplate=Cannot apply template \"{0}\"."
255	})	168	})
256	private void applySiteTemplate(	169	private void applySiteTemplate(
257	final FileObject projectDir,	170	final FileObject projectDir,
258	final SiteTemplateImplementation.ProjectProperties projectProperties,	171	final CreateProjectProperties props,
259	final SiteTemplateImplementation siteTemplate,	172	final OnlineSiteTemplate siteTemplate,
260	final ProgressHandle handle) {	173	final ProgressHandle handle) {
261		174
262	assert !EventQueue.isDispatchThread();	175	assert !EventQueue.isDispatchThread();
263	final String templateName = siteTemplate.getName();	176	final String templateName = siteTemplate.getName();
264	try {	177	try {
265	siteTemplate.apply(projectDir, projectProperties, handle);	178	siteTemplate.apply(projectDir, props, handle);
266	} catch (IOException ex) {	179	} catch (IOException ex) {
267	errorOccured(Bundle.OnlineSampleWizardIterator_error_applyingSiteTemplate(templateName));	180	errorOccured(Bundle.OnlineSampleWizardIterator_error_applyingSiteTemplate(templateName));
268	}	181	}

Line 0 Link Here

(-)a/web.clientproject/src/org/netbeans/modules/web/clientproject/createprojectapi/ClientSideProjectGenerator.java (+75 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2013 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2013 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.modules.web.clientproject.createprojectapi;
		43
		44	import java.io.IOException;
		45	import org.netbeans.api.annotations.common.NonNull;
		46	import org.netbeans.api.project.FileOwnerQuery;
		47	import org.netbeans.api.project.Project;
		48	import org.netbeans.modules.web.clientproject.ClientSideProject;
		49	import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation.ProjectProperties;
		50	import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
		51	import org.netbeans.spi.project.support.ant.AntProjectHelper;
		52
		53	public final class ClientSideProjectGenerator {
		54
		55	private ClientSideProjectGenerator() {
		56	}
		57
		58	/**
		59	* Creates a new empty Web Client Side project according to the given {@link ProjectProperties}.
		60	*
		61	* @param properties used for project setup
		62	* @return project
		63	* @throws IOException in case something went wrong
		64	*/
65	public static Project createProject(@NonNull CreateProjectProperties properties) throws IOException {
66	AntProjectHelper h = ClientSideProjectUtilities.setupProject(properties.getProjectDir(), properties.getProjectName());
67	ClientSideProject p = (ClientSideProject)FileOwnerQuery.getOwner(h.getProjectDirectory());
68	ClientSideProjectUtilities.initializeProject(p,
69	properties.getSiteRootFolder(),
70	properties.getTestFolder(),
71	properties.getConfigFolder());
72	return p;
73	}
74
75	}