Author: snjeza Date: 2011-10-03 05:40:00 -0400 (Mon, 03 Oct 2011) New Revision: 35268 Added: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/LaunchJUnitTest.java trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunProjectExample.java Modified: trunk/central/plugins/org.jboss.tools.central/plugin.xml trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/.project trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/META-INF/MANIFEST.MF trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/Activator.java trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/Messages.java trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/messages.properties trunk/runtime/plugins/org.jboss.tools.runtime.core/plugin.xml workspace/snjeza/jbossas7-examples/kitchensink.zip workspace/snjeza/jbossas7-examples/login.zip workspace/snjeza/jbossas7-examples/numberguess.zip Log: JBIDE-9368 Dashboard(s) for easy news aggregation, twitter and easy additional/3rd party plugin installation and project template/creation Modified: trunk/central/plugins/org.jboss.tools.central/plugin.xml =================================================================== --- trunk/central/plugins/org.jboss.tools.central/plugin.xml 2011-10-03 08:12:32 UTC (rev 35267) +++ trunk/central/plugins/org.jboss.tools.central/plugin.xml 2011-10-03 09:40:00 UTC (rev 35268) @@ -226,6 +226,15 @@ reference="JBoss AS 7 Quickstarts::kitchensink"/> <tutorial + id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Webapp" + categoryId="org.jboss.tools.central.jbossas.quickstart" + name="Creating your own application" + type="projectExample" + priority="5" + icon="icons/jbossas7.png" + reference="JBoss AS 7 Quickstarts::jboss-javaee6-webapp"/> + + <tutorial id="org.jboss.tools.central.Seam.registration2" categoryId="org.jboss.tools.central.seam2" name="Registration Example" Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml =================================================================== --- trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-10-03 08:12:32 UTC (rev 35267) +++ trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-10-03 09:40:00 UTC (rev 35268) @@ -160,7 +160,8 @@ </fix> </fixes> <importType>maven</importType> - <importTypeDescription>The project example requires the m2eclipse, m2eclipse-wtp and JBoss Maven Project Examples feature.</importTypeDescription> + <importTypeDescription>The project example requires the m2eclipse, m2eclipse-wtp and JBoss Maven Project Examples feature.</importTypeDescription> + <welcome type="cheatsheets" url="/jboss-as-login/cheatsheets/login.xml"/> </project> <project> @@ -200,7 +201,8 @@ </fix> </fixes> <importType>maven</importType> - <importTypeDescription>The project example requires the m2eclipse, m2eclipse-wtp and JBoss Maven Project Examples feature.</importTypeDescription> + <importTypeDescription>The project example requires the m2eclipse, m2eclipse-wtp and JBoss Maven Project Examples feature.</importTypeDescription> + <welcome type="cheatsheets" url="/jboss-as-numberguess/cheatsheets/numberguess.xml"/> </project> <project> @@ -241,7 +243,8 @@ </fix> </fixes> <importType>maven</importType> - <importTypeDescription>The project example requires the m2eclipse, m2eclipse-wtp and JBoss Maven Project Examples feature.</importTypeDescription> + <importTypeDescription>The project example requires the m2eclipse, m2eclipse-wtp and JBoss Maven Project Examples feature.</importTypeDescription> + <welcome type="cheatsheets" url="/jboss-as-kitchensink/cheatsheets/kitchensink.xml"/> </project> <project> @@ -282,11 +285,11 @@ </fix> </fixes> <importType>mavenArchetype</importType> - <importTypeDescription>The project example requires the m2eclipse-core, m2eclipse-wtp and JBoss Maven Project Examples feature.</importTypeDescription> + <importTypeDescription>The project example requires the m2e, m2eclipse-wtp and JBoss Maven Integration feature.</importTypeDescription> <mavenArchetype> <archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId> <archetypeArtifactId>jboss-javaee6-webapp</archetypeArtifactId> - <archetypeVersion>7.0.0.CR1</archetypeVersion> + <archetypeVersion>7.0.0.Final</archetypeVersion> <archetypeRepository>http://repository.jboss.org/nexus/content/groups/p... <groupId>org.jboss.tools.examples</groupId> <artifactId>jboss-javaee6-webapp</artifactId> @@ -297,5 +300,5 @@ </properties> </mavenArchetype> </project> - + </projects> Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/.project =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/.project 2011-10-03 08:12:32 UTC (rev 35267) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/.project 2011-10-03 09:40:00 UTC (rev 35268) @@ -1,34 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.jboss.tools.project.examples.cheatsheet</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.project.examples.cheatsheet</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + </natures> + <linkedResources> + <link> + <name>lib-org.jboss.tools.common.text.ext_3.3.0.v20111001-0437-H476-M4</name> + <type>2</type> + <location>E:/eclipse-3.7.1/plugins/org.jboss.tools.common.text.ext_3.3.0.v20111001-0437-H476-M4</location> + </link> + <link> + <name>lib-org.jboss.tools.common.text.xml_3.3.0.v20111001-0437-H476-M4</name> + <type>2</type> + <location>E:/eclipse-3.7.1/plugins/org.jboss.tools.common.text.xml_3.3.0.v20111001-0437-H476-M4</location> + </link> + <link> + <name>lib-org.jboss.tools.common_3.3.0.v20111001-0437-H476-M4</name> + <type>2</type> + <location>E:/eclipse-3.7.1/plugins/org.jboss.tools.common_3.3.0.v20111001-0437-H476-M4</location> + </link> + <link> + <name>lib-org.jboss.tools.jst.jsp_3.3.0.v20111001-0515-H542-M4</name> + <type>2</type> + <location>E:/eclipse-3.7.1/plugins/org.jboss.tools.jst.jsp_3.3.0.v20111001-0515-H542-M4</location> + </link> + </linkedResources> +</projectDescription> Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/META-INF/MANIFEST.MF =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/META-INF/MANIFEST.MF 2011-10-03 08:12:32 UTC (rev 35267) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/META-INF/MANIFEST.MF 2011-10-03 09:40:00 UTC (rev 35268) @@ -6,16 +6,16 @@ Bundle-Activator: org.jboss.tools.project.examples.cheatsheet.Activator Bundle-Vendor: %BundleVendor Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.ui.cheatsheets, - org.eclipse.jdt.core, - org.eclipse.core.resources, - org.eclipse.ui.ide, - org.eclipse.ui.workbench.texteditor, - org.eclipse.text, +Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.ui.cheatsheets;bundle-version="3.4.100", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.core.resources;bundle-version="3.7.0", + org.eclipse.ui.ide;bundle-version="3.7.0", + org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0", + org.eclipse.text;bundle-version="3.5.101", org.jboss.tools.jst.jsp, - org.eclipse.wst.sse.ui, + org.eclipse.wst.sse.ui;bundle-version="1.3.0", org.jboss.tools.common.text.ext, org.jboss.tools.common, org.jboss.tools.common.model, @@ -23,6 +23,8 @@ org.jboss.tools.project.examples, org.eclipse.wst.server.core, org.eclipse.wst.server.ui, - org.jboss.ide.eclipse.as.core + org.jboss.ide.eclipse.as.core, + org.eclipse.jdt.junit;bundle-version="3.7.0", + org.eclipse.debug.core;bundle-version="3.7.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/Activator.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/Activator.java 2011-10-03 08:12:32 UTC (rev 35267) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/Activator.java 2011-10-03 09:40:00 UTC (rev 35268) @@ -1,5 +1,7 @@ package org.jboss.tools.project.examples.cheatsheet; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -47,4 +49,14 @@ return plugin; } + public static void log(Throwable e) { + IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, e + .getLocalizedMessage(), e); + plugin.getLog().log(status); + } + + public static void log(String message) { + IStatus status = new Status(IStatus.WARNING, PLUGIN_ID,message); + plugin.getLog().log(status); + } } Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/Messages.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/Messages.java 2011-10-03 08:12:32 UTC (rev 35267) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/Messages.java 2011-10-03 09:40:00 UTC (rev 35268) @@ -5,6 +5,8 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.project.examples.cheatsheet.messages"; //$NON-NLS-1$ public static String OpenFileInEditor_Cannot_open; + public static String LaunchJunitTest_The_project_does_not_exist; + public static String RunProjectExample_Invalid_project_example; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java 2011-10-03 08:12:32 UTC (rev 35267) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java 2011-10-03 09:40:00 UTC (rev 35268) @@ -24,7 +24,6 @@ import org.jboss.tools.project.examples.model.IImportProjectExample; import org.jboss.tools.project.examples.model.Project; import org.jboss.tools.project.examples.model.ProjectUtil; -import org.jboss.tools.project.examples.wizard.NewProjectExamplesWizard; public class ImportProjectExample extends Action implements ICheatSheetAction { Added: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/LaunchJUnitTest.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/LaunchJUnitTest.java (rev 0) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/LaunchJUnitTest.java 2011-10-03 09:40:00 UTC (rev 35268) @@ -0,0 +1,88 @@ +package org.jboss.tools.project.examples.cheatsheet.actions; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.ProjectScope; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.IScopeContext; +import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.jdt.junit.launcher.JUnitLaunchShortcut; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IStatusLineManager; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.osgi.util.NLS; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.IViewSite; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.IWorkbenchPartSite; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.cheatsheets.ICheatSheetAction; +import org.eclipse.ui.cheatsheets.ICheatSheetManager; +import org.jboss.tools.project.examples.cheatsheet.Activator; +import org.jboss.tools.project.examples.cheatsheet.Messages; +import org.osgi.service.prefs.BackingStoreException; + +public class LaunchJUnitTest extends Action implements ICheatSheetAction { + + private static final String ACTIVE_PROFILES = "activeProfiles"; //$NON-NLS-1$ + + public void run(String[] params, ICheatSheetManager manager) { + if (params == null || params[0] == null) { + return; + } + IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot(); + + IProject project = workspaceRoot.getProject(params[0]); + if (project == null || !project.isOpen()) { + IWorkbenchPage page = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + setStatusMessage(page, NLS.bind(Messages.LaunchJunitTest_The_project_does_not_exist, params[0])); + return; + } + if (params[1] != null) { + IScopeContext projectScope = new ProjectScope(project); + IEclipsePreferences projectNode = projectScope + .getNode("org.eclipse.m2e.core"); //$NON-NLS-1$ + if (projectNode != null) { + String activeProfiles = projectNode.get(ACTIVE_PROFILES, null); + if (!params[1].equals(activeProfiles)) { + projectNode.put(ACTIVE_PROFILES, activeProfiles); + try { + projectNode.flush(); + } catch (BackingStoreException e) { + Activator.log(e); + } + } + } + } + ISelection selection = new StructuredSelection(project); + JUnitLaunchShortcut launchShortcut = new JUnitLaunchShortcut(); + launchShortcut.launch(selection, ILaunchManager.RUN_MODE); + } + + private void setStatusMessage(IWorkbenchPage page, String message) { + IWorkbenchPart activePart = page.getActivePart(); + IWorkbenchPartSite site = activePart.getSite(); + IActionBars actionBar = null; + if (site instanceof IViewSite) { + IViewSite viewSite = (IViewSite) site; + actionBar = viewSite.getActionBars(); + } else if (site instanceof IEditorSite) { + IEditorSite editorSite = (IEditorSite) site; + actionBar = editorSite.getActionBars(); + } + if (actionBar == null) { + return; + } + IStatusLineManager lineManager = actionBar.getStatusLineManager(); + if (lineManager == null) { + return; + } + lineManager.setMessage(message); + } + +} Added: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunProjectExample.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunProjectExample.java (rev 0) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunProjectExample.java 2011-10-03 09:40:00 UTC (rev 35268) @@ -0,0 +1,52 @@ +package org.jboss.tools.project.examples.cheatsheet.actions; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.action.Action; +import org.eclipse.osgi.util.NLS; +import org.eclipse.ui.cheatsheets.ICheatSheetAction; +import org.eclipse.ui.cheatsheets.ICheatSheetManager; +import org.jboss.tools.project.examples.ProjectExamplesActivator; +import org.jboss.tools.project.examples.cheatsheet.Activator; +import org.jboss.tools.project.examples.cheatsheet.Messages; +import org.jboss.tools.project.examples.model.Category; +import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectUtil; + +public class RunProjectExample extends Action implements ICheatSheetAction { + + public void run(String[] params, ICheatSheetManager manager) { + if(params == null || params[0] == null ) { + return; + } + + String[] projectExample = params[0].split("::"); //$NON-NLS-1$ + if (projectExample == null || projectExample.length != 2 || projectExample[0] == null || projectExample[1] == null) { + Activator.log(NLS.bind(Messages.RunProjectExample_Invalid_project_example, params[0])); + return; + } + List<Category> categories = ProjectUtil.getProjects(new NullProgressMonitor()); + Project project = null; + for (Category category:categories) { + if (projectExample[0].equals(category.getName())) { + for (Project p:category.getProjects()) { + if (projectExample[1].equals(p.getName())) { + project = p; + break; + } + } + } + if (project != null) { + break; + } + } + if (project != null) { + List<Project> selectedProjects = new ArrayList<Project>(); + selectedProjects.add(project); + ProjectExamplesActivator.importProjectExamples(selectedProjects, true); + } + } + +} Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/messages.properties =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/messages.properties 2011-10-03 08:12:32 UTC (rev 35267) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/messages.properties 2011-10-03 09:40:00 UTC (rev 35268) @@ -1 +1,3 @@ OpenFileInEditor_Cannot_open=Cannot open the {0} file. +LaunchJunitTest_The_project_does_not_exist = The '{0}' project doesn't exist. +RunProjectExample_Invalid_project_example=Invalid project example: {0}. Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/plugin.xml =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/plugin.xml 2011-10-03 08:12:32 UTC (rev 35267) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/plugin.xml 2011-10-03 09:40:00 UTC (rev 35268) @@ -10,9 +10,15 @@ id="org.jboss.tools.runtime.core.as.701" name="JBoss AS 7.0.1 Everything (NOT Java EE6 Certified)" version="7.0.1.Final" - size="68MB" + size="74MB" url="http://download.jboss.org/jbossas/7.0/jboss-as-7.0.1.Final/jbos... <runtime + id="org.jboss.tools.runtime.core.as.702" + name="JBoss AS 7.0.2 Everything (NOT Java EE6 Certified)" + version="7.0.2.Final" + size="75MB" + url="http://download.jboss.org/jbossas/7.0/jboss-as-7.0.2.Final/jbos... + <runtime id="org.jboss.tools.runtime.core.seam.222" name="JBoss Seam 2.2.2.Final" version="2.2.2.Final" Modified: workspace/snjeza/jbossas7-examples/kitchensink.zip =================================================================== (Binary files differ) Modified: workspace/snjeza/jbossas7-examples/login.zip =================================================================== (Binary files differ) Modified: workspace/snjeza/jbossas7-examples/numberguess.zip =================================================================== (Binary files differ)