You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sr...@apache.org on 2018/09/30 09:13:22 UTC

[incubator-netbeans] branch master updated: [NETBEANS-1295] Add groovy to release config (#904)

This is an automated email from the ASF dual-hosted git repository.

sreimers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 67875cd  [NETBEANS-1295] Add groovy to release config (#904)
67875cd is described below

commit 67875cd3b0825a906d01af590ea751193958ba5a
Author: Sven Reimers <sv...@users.noreply.github.com>
AuthorDate: Sun Sep 30 11:13:14 2018 +0200

    [NETBEANS-1295] Add groovy to release config (#904)
    
    * Add groovy to release config
    
    * Removing grails until enterprise cluster is ready.
    
    * Fix ergonmoics releated issue after removal of grails project type
---
 ergonomics/ide.ergonomics/groovy.properties        |   2 -
 groovy/groovy.kit/nbproject/project.xml            |  12 -
 .../netbeans/modules/groovy/kit/Bundle.properties  |   2 +-
 .../modules/groovy/qaf/GrailsActionsTest.java      | 322 ---------------------
 .../modules/groovy/qaf/GrailsTestCase.java         | 135 ---------
 .../modules/groovy/qaf/GrailsWizardsTest.java      | 124 --------
 nbbuild/cluster.properties                         |   3 +-
 7 files changed, 2 insertions(+), 598 deletions(-)

diff --git a/ergonomics/ide.ergonomics/groovy.properties b/ergonomics/ide.ergonomics/groovy.properties
index a556b52..0cc6c4b 100644
--- a/ergonomics/ide.ergonomics/groovy.properties
+++ b/ergonomics/ide.ergonomics/groovy.properties
@@ -15,7 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-project.file.grails-app=org.netbeans.modules.groovy.grailsproject.GrailsProjectFactory
-
 mainModule=org.netbeans.modules.groovy.kit
 project.xpath.nbproject/project.xml=project/configuration/buildExtensions/extension[@id='groovy']
diff --git a/groovy/groovy.kit/nbproject/project.xml b/groovy/groovy.kit/nbproject/project.xml
index 1a6b09b..437eeed 100644
--- a/groovy/groovy.kit/nbproject/project.xml
+++ b/groovy/groovy.kit/nbproject/project.xml
@@ -39,18 +39,6 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.groovy.grails</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.7</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.groovy.grailsproject</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.9</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.modules.groovy.gsp</code-name-base>
                     <run-dependency>
                         <specification-version>1.6</specification-version>
diff --git a/groovy/groovy.kit/src/org/netbeans/modules/groovy/kit/Bundle.properties b/groovy/groovy.kit/src/org/netbeans/modules/groovy/kit/Bundle.properties
index a5cda99..be6c741 100644
--- a/groovy/groovy.kit/src/org/netbeans/modules/groovy/kit/Bundle.properties
+++ b/groovy/groovy.kit/src/org/netbeans/modules/groovy/kit/Bundle.properties
@@ -18,5 +18,5 @@ OpenIDE-Module-Display-Category=Groovy
 OpenIDE-Module-Long-Description=\
     This module provides all Groovy and Grails functionality available in NetBeans. \
     It is wrapper for all single modules in this area.
-OpenIDE-Module-Name=Groovy and Grails
+OpenIDE-Module-Name=Groovy
 OpenIDE-Module-Short-Description=Wrapper module for all Groovy and Grails functionality
diff --git a/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsActionsTest.java b/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsActionsTest.java
deleted file mode 100644
index d14c1d5..0000000
--- a/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsActionsTest.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.modules.groovy.qaf;
-
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import javax.swing.SwingUtilities;
-import junit.framework.Test;
-import org.netbeans.jellytools.Bundle;
-import org.netbeans.jellytools.EditorOperator;
-import org.netbeans.jellytools.FilesTabOperator;
-import org.netbeans.jellytools.NbDialogOperator;
-import org.netbeans.jellytools.actions.Action;
-import org.netbeans.jellytools.actions.OpenAction;
-import org.netbeans.jellytools.nodes.Node;
-import org.netbeans.jemmy.JemmyProperties;
-import org.netbeans.jemmy.TimeoutExpiredException;
-import org.netbeans.jemmy.operators.JButtonOperator;
-import org.netbeans.jemmy.operators.JListOperator;
-import org.netbeans.jemmy.operators.JTabbedPaneOperator;
-import org.netbeans.jemmy.operators.JTextFieldOperator;
-import org.netbeans.junit.NbModuleSuite;
-import org.netbeans.modules.groovy.grails.settings.GrailsSettings;
-import org.netbeans.modules.groovy.grailsproject.actions.GotoDomainClassAction;
-import org.openide.windows.TopComponent;
-
-/**
- * Tests for actions available on Grails projects
- *
- * @author lukas
- */
-public class GrailsActionsTest extends GrailsTestCase {
-
-    private static final String APP_PORT = "9998"; //NOI18N
-    private static final String DEFAULT_PORT = "8080"; //NOI18N
-    private static final String PLUGIN_NAME = "testing"; //NOI18N
-    private static boolean isPortSet = false;
-    private OpenAction oa = new OpenAction();
-
-    public GrailsActionsTest(String name) {
-        super(name);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        if (!isPortSet) {
-            setApplicationPort(APP_PORT);
-            assertEquals(APP_PORT, GrailsSettings.getInstance().getPortForProject(getProject()));
-            isPortSet = true;
-        }
-    }
-
-    @Override
-    protected String getProjectName() {
-        return "GrailsActions"; //NOI18N
-    }
-
-    /**
-     * Test Generate all action on the domain class node
-     *
-     */
-    public void testGenerateAll() {
-        //Generate All
-        String label = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.actions.Bundle", "CTL_GenerateAllAction");
-        getDomainClassNode("Book").performPopupAction(label); //NOI18N
-        waitFor("generate-all", "Finished generation for domain class"); //NOI18N
-    }
-
-    /**
-     * Test for Grails Plugins action
-     *  -install plugin
-     */
-    public void testManagePlugins() {
-        //open plugin manager and install a plugin
-        //Grails Plugins...
-        String actionLabel = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.actions.Bundle", "CTL_ManagePluginsAction");
-        getProjectRootNode().performPopupActionNoBlock(actionLabel);
-        //Grails Plugins
-        String title = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.actions.Bundle", "CTL_PluginTitle");
-        NbDialogOperator ndo = new NbDialogOperator(title);
-        JTabbedPaneOperator jtpo = new JTabbedPaneOperator(ndo);
-        //New Plugins
-        String tabTitle = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.ui.Bundle", "GrailsPluginPanel.newPlugins");
-        jtpo.selectPage(tabTitle);
-        JListOperator jlo = new JListOperator(jtpo);
-        JemmyProperties.setCurrentTimeout("ComponentOperator.WaitStateTimeout", 500000); //NOI18N
-        jlo.waitItem("activemq", 1);
-        jlo.selectItem(PLUGIN_NAME);
-        //Install
-        String btnLabel = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.ui.Bundle", "GrailsPluginPanel.installButton.text");
-        new JButtonOperator(jtpo, btnLabel).push();
-        //Installed
-        tabTitle = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.ui.Bundle", "GrailsPluginPanel.installed");
-        JemmyProperties.setCurrentTimeout("ComponentOperator.WaitStateTimeout", 240000); //NOI18N
-        jtpo.selectPage(tabTitle);
-        jlo = new JListOperator(jtpo);
-        jlo.waitItem(PLUGIN_NAME, 0);
-        assertEquals(1, jlo.getModel().getSize());
-        ndo.closeByButton();
-    }
-
-    /**
-     * Test Create view action on the domain class node
-     *
-     */
-    public void testGenerateViews() {
-        //Generate Views
-        String label = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.actions.Bundle", "CTL_GenerateViewsAction");
-        getDomainClassNode("Author").performPopupAction(label); //NOI18N
-        waitFor("generate-views", "Finished generation for domain class"); //NOI18N
-    }
-
-    /**
-     * Test Go to Controller action
-     *
-     */
-    public void testGotoController() {
-        //Go to Grails Controller
-        Action a = getGrailsNavigateAction("CTL_GotoControllerAction"); //NOI18N
-        //from a domain class
-        oa.perform(getDomainClassNode("Book")); //NOI18N
-        EditorOperator eo = new EditorOperator("Book.groovy"); //NOI18N
-        assertNotNull(eo);
-        try {
-            //XXX - first call to popup can fail (win, solaris)
-            a.performPopup(eo);
-        } catch (TimeoutExpiredException tee) {
-            //try it once again
-            a.performPopup(eo);
-        }
-        assertTrue(getActiveTC().endsWith("controllers" + File.separator + "BookController.groovy")); //NOI18N
-        //from a view
-        oa.perform(getViewNode("book|edit")); //NOI18N
-        eo = new EditorOperator("edit.gsp"); //NOI18N
-        assertNotNull(eo);
-        a.performPopup(eo); //NOI18N
-        assertTrue(getActiveTC().endsWith("controllers" + File.separator + "BookController.groovy")); //NOI18N
-    }
-
-    /**
-     * Test Go to View action
-     *
-     */
-    public void testGotoView() {
-        //Go to Grails View
-        Action a = getGrailsNavigateAction("CTL_GotoViewAction"); //NOI18N
-        //from a domain class
-        oa.perform(getDomainClassNode("Book")); //NOI18N
-        EditorOperator eo = new EditorOperator("Book.groovy"); //NOI18N
-        assertNotNull(eo);
-        a.performPopup(eo);
-        assertTrue(getActiveTC().endsWith("views" + File.separator + "book" + File.separator + "show.gsp")); //NOI18N
-        //from a controller
-        oa.perform(getControllerNode("BookController")); //NOI18N
-        eo = new EditorOperator("BookController.groovy"); //NOI18N
-        assertNotNull(eo);
-        a.performPopup(eo);
-        assertTrue(getActiveTC().endsWith("views" + File.separator + "book" + File.separator + "show.gsp")); //NOI18N
-    }
-
-    /**
-     * Test Go to Domain class action
-     *
-     */
-    public void testGotoDomainClass() throws InterruptedException, InvocationTargetException {
-        //XXX - no direct UI entry to this action
-        // see: http://www.netbeans.org/issues/show_bug.cgi?id=154768
-        final GotoDomainClassAction a = new GotoDomainClassAction();
-        //from a view
-        oa.perform(getViewNode("book|list")); //NOI18N
-        final EditorOperator eo = new EditorOperator("list.gsp"); //NOI18N
-        assertNotNull(eo);
-        assertTrue(a.isEnabled());
-        SwingUtilities.invokeAndWait(new Runnable() {
-
-            public void run() {
-                a.actionPerformed(new ActionEvent(eo.txtEditorPane().getSource(), -1, null));
-            }
-        });
-        assertTrue(getActiveTC().endsWith("domain" + File.separator + "Book.groovy")); //NOI18N
-        //from a controller
-        oa.perform(getControllerNode("BookController")); //NOI18N
-        final EditorOperator eo2 = new EditorOperator("BookController.groovy"); //NOI18N
-        assertNotNull(eo2);
-        assertTrue(a.isEnabled());
-        SwingUtilities.invokeAndWait(new Runnable() {
-
-            public void run() {
-                a.actionPerformed(new ActionEvent(eo2.txtEditorPane().getSource(), -1, null));
-            }
-        });
-        assertTrue(getActiveTC().endsWith("domain" + File.separator + "Book.groovy")); //NOI18N
-    }
-
-    /**
-     * Test grails project Run and Stop actions
-     *
-     */
-    public void testStopApp() {
-        //XXX - better to have ability to not open browser during run
-        //      (remove TestURLDisplayer, can be changed after
-        //       http://www.netbeans.org/issues/show_bug.cgi?id=154920)
-        runGrailsApp();
-        stopGrailsApp();
-    }
-
-    /**
-     * Test for Grails Plugins action
-     *  -uninstall plugin
-     */
-    public void testUninstallPlugin() {
-        //open the dialog again and uninstall previously installed plugin
-        //Grails Plugins...
-        String actionLabel = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.actions.Bundle", "CTL_ManagePluginsAction");
-        getProjectRootNode().performPopupActionNoBlock(actionLabel);
-        //Grails Plugins
-        String title = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.actions.Bundle", "CTL_PluginTitle");
-        NbDialogOperator ndo = new NbDialogOperator(title);
-        JTabbedPaneOperator jtpo = new JTabbedPaneOperator(ndo);
-        JListOperator jlo = new JListOperator(jtpo);
-        jlo.selectItem(PLUGIN_NAME);
-        //Uninstall
-        String btnLabel = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.ui.Bundle", "GrailsPluginPanel.uninstallButton.text");
-        new JButtonOperator(jtpo, btnLabel).push();
-        //XXX - need in case project is versioned by hg (bug?)
-        long end = System.currentTimeMillis() + 240000;
-        while (jlo.getModel().getSize() > 0 && System.currentTimeMillis() < end) {
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException ie) {}
-        }
-        assertEquals(0, jlo.getModel().getSize());
-        ndo.closeByButton();
-    }
-
-    /**
-     * Test Create war project action
-     *
-     */
-    public void testCreateWar() {
-        String label = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.actions.Bundle", "LBL_CreateWarFile");
-        getProjectRootNode().performPopupAction(label);
-        waitFor("war", "Done creating WAR"); //NOI18N
-        FilesTabOperator fto = FilesTabOperator.invoke();
-        Node n = new Node(fto.getProjectNode(getProjectName()), getProjectName() + "-0.1.war"); //NOI18N
-        assertNotNull(n);
-    }
-
-    private void setApplicationPort(String port) {
-        getProjectRootNode().properties();
-        NbDialogOperator ndo = new NbDialogOperator(getProjectName());
-        JTextFieldOperator jtfo = new JTextFieldOperator(ndo, DEFAULT_PORT);
-        jtfo.clearText();
-        jtfo.typeText(port);
-        ndo.btOK().push();
-        //wait till project data are really saved
-        //Saving Project data
-        String saveDlgTitle = Bundle.getStringTrimmed("org.netbeans.modules.project.uiapi.Bundle", "LBL_Saving_Project_data");
-        waitDialogClosed(saveDlgTitle);
-    }
-
-    private Node getDomainClassNode(String domainClass) {
-        //Domain Classes
-        String label = getNodeLabel("LBL_grails-app_domain"); //NOI18N
-        Node n = new Node(getProjectRootNode(), label);
-        return new Node(n, domainClass + ".groovy"); //NOI18N
-    }
-
-    private Node getControllerNode(String controller) {
-        //Controllers
-        String label = getNodeLabel("LBL_grails-app_controllers"); //NOI18N
-        Node n = new Node(getProjectRootNode(), label);
-        return new Node(n, controller + ".groovy"); //NOI18N
-    }
-
-    private Node getViewNode(String view) {
-        //Views and Layouts
-        String label = getNodeLabel("LBL_grails-app_views"); //NOI18N
-        Node n = new Node(getProjectRootNode(), label);
-        return new Node(n, view + ".gsp"); //NOI18N
-    }
-
-    private String getNodeLabel(String key) {
-        return Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.Bundle", key);
-    }
-
-    private Action getGrailsNavigateAction(String key) {
-        String groupLabel = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.Bundle", "Editors/text/x-gsp/Popup/goto");
-        String actionLabel = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.actions.Bundle", key);
-        return new Action(null, groupLabel + "|" + actionLabel); //NOI18N
-    }
-
-    private String getActiveTC() {
-        return TopComponent.getRegistry().getActivated().getToolTipText();
-    }
-
-    public static Test suite() {
-        return NbModuleSuite.create(
-                NbModuleSuite.createConfiguration(GrailsActionsTest.class)
-                .enableModules(".*").clusters(".*")); //NOI18N
-    }
-
-}
diff --git a/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsTestCase.java b/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsTestCase.java
deleted file mode 100644
index e5331b5..0000000
--- a/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsTestCase.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.netbeans.modules.groovy.qaf;
-
-import java.io.File;
-import java.util.logging.Logger;
-import org.netbeans.api.project.Project;
-import org.netbeans.jellytools.Bundle;
-import org.netbeans.jellytools.NewJavaFileNameLocationStepOperator;
-import org.netbeans.jellytools.OutputOperator;
-import org.netbeans.jellytools.OutputTabOperator;
-import org.netbeans.jellytools.modules.j2ee.nodes.J2eeServerNode;
-import org.netbeans.jellytools.nodes.Node;
-import org.netbeans.jemmy.JemmyProperties;
-import org.netbeans.modules.groovy.grails.RuntimeHelper;
-import org.netbeans.modules.groovy.grails.settings.GrailsSettings;
-import org.openide.util.Utilities;
-
-/**
- *
- * @author lukas
- */
-public abstract class GrailsTestCase extends GroovyTestCase {
-
-    private static final Logger LOGGER = Logger.getLogger(GrailsTestCase.class.getName());
-    private static boolean haveGrails = false;
-
-    public GrailsTestCase(String name) {
-        super(name);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        if (!haveGrails) {
-            //we may want to bypass defaults in test
-            String grailsHome = System.getProperty("grails.home"); //NOI18N
-            if (grailsHome == null || grailsHome.trim().length() == 0) {
-                //try fallback to the defaults
-                GrailsSettings gs = GrailsSettings.getInstance();
-                assertNotNull("Grails missing", gs.getGrailsBase()); //NOI18N
-            } else {
-                if (Utilities.isUnix()) {
-                    assertTrue(new File(grailsHome, "bin/grails").isFile()); //NOI18N
-                } else {
-                    assertTrue(new File(grailsHome, "bin" + File.separator + "grails.bat").isFile()); //NOI18N
-                }
-                GrailsSettings gs = GrailsSettings.getInstance();
-                gs.setGrailsBase(new File(grailsHome).getCanonicalPath());
-            }
-            haveGrails = true;
-            LOGGER.info("Using Grails at: " + GrailsSettings.getInstance().getGrailsBase()); //NOI18N
-        }
-        assertTrue("Grails missing", haveGrails); //NOI18N
-        super.setUp();
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    @Override
-    protected ProjectType getProjectType() {
-        return ProjectType.GROOVY;
-    }
-
-    protected void createNewGrailsFile(Project p, String type, String name) {
-        String label = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.ui.wizards.Bundle", type);
-        createNewGroovyFile(p, label);
-        NewJavaFileNameLocationStepOperator op = new NewJavaFileNameLocationStepOperator();
-        op.setObjectName(name);
-        String createdFile = op.txtCreatedFile().getText();
-        op.btFinish().pushNoBlock();
-        JemmyProperties.setCurrentTimeout("ComponentOperator.WaitStateTimeout", 90000); //NOI18N
-        op.waitClosed();
-        assertTrue(new File(createdFile).isFile());
-    }
-
-    protected void runGrailsApp() {
-        //Run
-        String label = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grailsproject.ui.Bundle", "LBL_RunAction_Name");
-        getProjectRootNode().performPopupAction(label);
-        waitFor("run-app", ":INFO:  GSP servlet initialized"); //NOI18N
-        assertNotNull(getServerNodeForApp());
-    }
-
-    protected void stopGrailsApp() {
-        //Stop
-        String actionLabel = Bundle.getStringTrimmed("org.netbeans.modules.groovy.grails.server.Bundle", "ApplicationNode.stopActionName");
-        getServerNodeForApp().performPopupAction(actionLabel);
-    }
-
-    private Node getServerNodeForApp() {
-        String bundle = "org.netbeans.modules.groovy.grails.server.Bundle"; //NOI18N
-        GrailsSettings gs = GrailsSettings.getInstance();
-        //Jetty (Grails {0})
-        String serverLabel = Bundle.getStringTrimmed(bundle, "GrailsInstance.displayName", //NOI18N
-                new Object[] {RuntimeHelper.getRuntimeVersion(new File(gs.getGrailsBase()))});
-        J2eeServerNode serverNode = J2eeServerNode.invoke(serverLabel);
-        //{app} on {port} //app node
-        String nodeLabel = Bundle.getStringTrimmed(bundle, "ApplicationNode.displayName", //NOI18N
-                new Object[] {getProjectName(), gs.getPortForProject(getProject())});
-        return new Node(serverNode, nodeLabel);
-    }
-
-    /**
-     * Wait for text in an output tab
-     *
-     * @param action action name as it appears in output tab label
-     * @param text text to wait for
-     */
-    protected void waitFor(String action, String text) {
-        OutputOperator oo = OutputOperator.invoke();
-        OutputTabOperator oto = oo.getOutputTab(getProjectName() + " (" + action + ")"); //NOI18N
-        // wait at most 360 second until progress dialog dismiss
-        JemmyProperties.setCurrentTimeout("ComponentOperator.WaitStateTimeout", 360000); //NOI18N
-        oto.waitText(text);
-    }
-}
diff --git a/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsWizardsTest.java b/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsWizardsTest.java
deleted file mode 100644
index 1ff351b..0000000
--- a/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsWizardsTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.modules.groovy.qaf;
-
-import junit.framework.Test;
-import org.netbeans.jellytools.Bundle;
-import org.netbeans.jellytools.EditorOperator;
-import org.netbeans.jellytools.NewJavaFileNameLocationStepOperator;
-import org.netbeans.junit.NbModuleSuite;
-
-/**
- * Tests for Grails specific new file wizards
- *
- * @author lukas
- */
-public class GrailsWizardsTest extends GrailsTestCase {
-
-    public GrailsWizardsTest(String name) {
-        super(name);
-    }
-
-    @Override
-    protected String getProjectName() {
-        return "GrailsWizards"; //NOI18N
-    }
-
-    /**
-     * Test create new GSP file
-     */
-    public void testGSPFile() {
-        String label = Bundle.getStringTrimmed("org.netbeans.modules.groovy.gsp.resources.Bundle", "Templates/Groovy/_view.gsp");
-        createNewGroovyFile(getProject(), label);
-        NewJavaFileNameLocationStepOperator op = new NewJavaFileNameLocationStepOperator();
-        op.setObjectName("MyGSP"); //NOI18N
-        op.finish();
-    }
-
-    /**
-     * Test create new Domain class
-     */
-    public void testDomainClass() {
-        createNewGrailsFile(getProject(), "Templates/Groovy/DomainClass.groovy", "MyDomainClass"); //NOI18N
-        EditorOperator eo = new EditorOperator("MyDomainClass.groovy"); //NOI18N
-        assertNotNull(eo);
-    }
-
-    /**
-     * Test create new Controller
-     */
-    public void testController() {
-        createNewGrailsFile(getProject(), "Templates/Groovy/Controller.groovy", "MyController"); //NOI18N
-        EditorOperator eo = new EditorOperator("MyControllerController.groovy"); //NOI18N
-        assertNotNull(eo);
-    }
-
-    /**
-     * Test create new Gant script
-     */
-    public void testGantScript() {
-        createNewGrailsFile(getProject(), "Templates/Groovy/GantScript.groovy", "MyGantScript"); //NOI18N
-        EditorOperator eo = new EditorOperator("MyGantScript.groovy"); //NOI18N
-        assertNotNull(eo);
-    }
-
-    /**
-     * Test create new Service
-     */
-    public void testService() {
-        createNewGrailsFile(getProject(), "Templates/Groovy/Service.groovy", "MyService"); //NOI18N
-        EditorOperator eo = new EditorOperator("MyServiceService.groovy"); //NOI18N
-        assertNotNull(eo);
-    }
-
-    /**
-     * Test create new Tag Library
-     */
-    public void testTagLib() {
-        createNewGrailsFile(getProject(), "Templates/Groovy/TagLib.groovy", "MyTagLib"); //NOI18N
-        EditorOperator eo = new EditorOperator("MyTagLibTagLib.groovy"); //NOI18N
-        assertNotNull(eo);
-    }
-
-    /**
-     * Test create new Unit test
-     */
-    public void testUnitTest() {
-        createNewGrailsFile(getProject(), "Templates/Groovy/UnitTest.groovy", "MyUnitTest"); //NOI18N
-        EditorOperator eo = new EditorOperator("MyUnitTestTests.groovy"); //NOI18N
-        assertNotNull(eo);
-    }
-
-    /**
-     * Test create new Integration test
-     */
-    public void testIntegrationTest() {
-        createNewGrailsFile(getProject(), "Templates/Groovy/IntegrationTest.groovy", "MyIntegrationTest"); //NOI18N
-        EditorOperator eo = new EditorOperator("MyIntegrationTestTests.groovy"); //NOI18N
-        assertNotNull(eo);
-    }
-
-    public static Test suite() {
-        return NbModuleSuite.create(
-                NbModuleSuite.createConfiguration(GrailsWizardsTest.class)
-                .enableModules(".*").clusters(".*")); //NOI18N
-    }
-
-}
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 9990871..7ee9105 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -24,6 +24,7 @@ clusters.config.release.list=\
         nb.cluster.apisupport,\
         nb.cluster.webcommon,\
         nb.cluster.php,\
+        nb.cluster.groovy,\
         nb.cluster.ergonomics
 # ergonomics must be last
 
@@ -965,8 +966,6 @@ nb.cluster.groovy.depends=\
 nb.cluster.groovy=\
         groovy.antproject,\
         groovy.editor,\
-        groovy.grails,\
-        groovy.grailsproject,\
         groovy.gsp,\
         groovy.kit,\
         groovy.refactoring,\


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists