JBoss Tools SVN: r44420 - trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-10-11 04:19:12 -0400 (Thu, 11 Oct 2012)
New Revision: 44420
Added:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
Log:
Added test for creating projects witch java 1.7
Refactoring tests.
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java 2012-10-11 07:24:58 UTC (rev 44419)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java 2012-10-11 08:19:12 UTC (rev 44420)
@@ -7,6 +7,7 @@
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
BaseFunctionalityTest.class,
+ CreateProjectsWithJava7Test.class,
CreateProjectsWithServerTest.class,
DocumentationSectionTest.class
// InstallTest.class
Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java (rev 0)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java 2012-10-11 08:19:12 UTC (rev 44420)
@@ -0,0 +1,84 @@
+package org.jboss.tools.central.test.ui.bot;
+
+import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellIsActive;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.jboss.tools.ui.bot.ext.SWTFormsBotExt;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
+import org.jboss.tools.ui.bot.ext.view.ProblemsView;
+
+public class CreateProjectsWithJava7Test extends CreateProjectsWithServerTest{
+
+ /**
+ * Checks given example and tries to set compilation level to Java 1.7
+ */
+
+ @Override
+ protected void checkExample(SWTFormsBotExt formsBot, String formText,
+ boolean readme, String projectName, String readmeFileName) {
+
+ super.checkExample(formsBot, formText, readme, projectName, readmeFileName);
+ projectExplorer.show();
+ formText = formText.replaceAll("\\s", "");
+ if (formText.equals("JavaEEProject")){
+ setupMultiProject(formText);
+ }else{
+ setupProject((projectName==null) ? formText : projectName, true, true);
+ }
+ assertNull("There should be no errors in Problems view", ProblemsView.getErrorsNode(bot));
+ }
+
+ private void setupMultiProject(String formText){
+ setupProject(formText+"-ear", false, true);
+ setupProject(formText+"-ejb", true, true);
+ setupProject(formText+"-web", true, true);
+ }
+
+ private void setupProject(String formText, boolean compiler, boolean facets){
+ projectExplorer.bot().tree().getTreeItem(formText).select();
+ projectExplorer.bot().tree().getTreeItem(formText).pressShortcut(SWT.ALT, SWT.CR, SWT.LF);
+ bot.waitForShell("Properties for " + formText);
+ if (compiler) setupCompiler(formText);
+ if (facets) setupFacets(formText);
+ bot.button("OK").click();
+ bot.waitForShell("Compiler Settings Changed");
+ if (bot.activeShell().getText().equals("Compiler Settings Changed")){
+ bot.button("Yes").click();
+ }
+ util.waitForNonIgnoredJobs();
+ bot.waitWhile(shellIsActive("Properties for " + formText), TaskDuration.VERY_LONG.getTimeout());
+ util.waitForNonIgnoredJobs(TaskDuration.VERY_LONG.getTimeout());
+ }
+
+ private void setupFacets(String formText){
+ bot.tree().getTreeItem("Project Facets").select();
+ bot.tree(1).getTreeItem("Java").click(1);
+ SWTBotShell facetsShell = null;
+ for (SWTBotShell shell : bot.shells()) {
+ if (shell.getText().isEmpty()){
+ try{
+ shell.bot().list();
+ facetsShell = shell;
+ }catch (WidgetNotFoundException ex){
+ //nothing to do here
+ }
+ }
+ }
+ if (facetsShell == null){
+ fail("Unable to select Java 1.7 in Project Facets");
+ }else{
+ facetsShell.bot().list().select("1.7");
+ }
+ }
+ /**
+ * Properties window should be open by the time, this method is called
+ * @param formText
+ */
+ private void setupCompiler(String formText){
+ bot.tree().getTreeItem("Java Compiler").select();
+ bot.checkBox(1).deselect();
+ bot.comboBox().setSelection("1.7");
+ }
+}
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-10-11 07:24:58 UTC (rev 44419)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-10-11 08:19:12 UTC (rev 44420)
@@ -10,13 +10,11 @@
import org.jboss.tools.ui.bot.ext.SWTFormsBotExt;
import org.jboss.tools.ui.bot.ext.SWTOpenExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Preference;
-import org.jboss.tools.ui.bot.ext.parts.SWTBotFormTextExt;
import org.jboss.tools.ui.bot.ext.parts.SWTBotTwistie;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.view.ProblemsView;
@@ -27,7 +25,7 @@
//TODO When testing new build try it with type=ServerType.EAP !!!!
-@Require(clearProjects=false,server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.ALL))
+@Require(clearProjects=false,server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.JbossAS))
public class CreateProjectsWithServerTest extends SWTTestExt{
@BeforeClass
@@ -64,9 +62,7 @@
deleteDirectory(mvnLocalRepo);
}
//Now is ~/.m2/clean-repository deleted and settings.xml exists. Next step is to tell eclipse to use our settings.xml
- bot.menu("Window").menu("Preferences").click();
- bot.waitForShell("Preferences");
- bot.tree().expandNode("Maven").select("User Settings");
+ open.preferenceOpen(Preference.create("Maven", "User Settings"));
if (bot.text(1).getText().equals("User settings file doesn't exist")){
bot.text(2).setText(mvnConfigFileName);
}else{
@@ -96,6 +92,7 @@
@After
public void teardown(){
+ projectExplorer.deleteAllProjects();
servers.removeAllProjectsFromServer("AS-7.0");
}
@@ -128,24 +125,44 @@
projectExampleShell.activate();
assertFalse("Button \"Download and Install...\" should not be enabled, because all requirements should have been met, condition", bot.button("Download and Install...").isEnabled());
projectExampleShell.close();
-
- //check the rest of project examples
+ bot.toolbarDropDownButtonWithTooltip("New").click();
+ bot.waitForShell("New");
+ assertTrue("Shell \"New\" should have appeared", bot.shell("New").isActive());
+ bot.activeShell().close();
+ }
+
+
+ @Test
+ public void createProjectSectionJavaEEWebProjectTest(){
checkExample(null, IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT, true);
+ canBeDeployedTest();
+ }
+
+ @Test
+ public void createProjectSectionJavaEEProjectTest(){
checkExample(null, IDELabel.JBossCentralEditor.JAVA_EE_PROJECT, true);
+ canBeDeployedTest();
+ }
+
+ @Test
+ public void createProjectSectionHTML5ProjectTest(){
checkExample(null, IDELabel.JBossCentralEditor.HTML5_PROJECT, true);
+ canBeDeployedTest();
+ }
+
+ @Test
+ public void createProjectSectionRichFacesProjectTest(){
checkExample(null, IDELabel.JBossCentralEditor.RICHFACES_PROJECT, true);
+ canBeDeployedTest();
+ }
+
+ @Test
+ public void createProjectSectionSpringMVCProjectTest(){
checkExample(null, IDELabel.JBossCentralEditor.SPRING_MVC_PROJECT, true);
-
- bot.toolbarDropDownButtonWithTooltip("New").click();
- bot.waitForShell("New");
- assertTrue("Shell \"New\" should have appeared", bot.shell("New").isActive());
- bot.activeShell().close();
canBeDeployedTest();
- projectExplorer.deleteAllProjects();
}
- @Test
- public void projectExamplesSectionTest(){
+ public void projectExamplesSectionTest(String name, String projectName, String readmeFile){
SWTBotTwistie twistieBot = bot.twistieByLabel("JBoss Quickstarts");
int counter = 0;
while (!twistieBot.isExpanded() && counter<10){
@@ -153,17 +170,45 @@
counter++;
}
SWTFormsBotExt formsBot = SWTBotFactory.getFormsBot();
- checkExample(formsBot, "Helloworld", true);
- checkExample(formsBot, "Numberguess", true);
- checkExample(formsBot, "Login", true, "login.xml"); //Login has some weird login.xml cheatsheet
- checkExample(formsBot, "Kitchensink", true);
- checkExample(formsBot, "HTML5", true);
+ if (readmeFile == null){
+ checkExample(formsBot, name, true, projectName);
+ }else{
+ checkExample(formsBot, name, true, projectName, readmeFile);
+ }
canBeDeployedTest();
- projectExplorer.deleteAllProjects();
}
+ public void projectExamplesSectionTest(String name, String projectName){
+ projectExamplesSectionTest(name, projectName, null);
+ }
+
+ @Test
+ public void projectExamplesSectionHelloworldTest(){
+ projectExamplesSectionTest("Helloworld", "jboss-as-helloworld");
+ }
+
+ @Test
+ public void projectExamplesSectionNumberguessTest(){
+ projectExamplesSectionTest("Numberguess", "jboss-as-numberguess");
+ }
+
+ @Test
+ public void projectExamplesSectionLoginTest(){
+ projectExamplesSectionTest("Login", "jboss-as-login", "login.xml");
+ }
+
+ @Test
+ public void projectExamplesSectionKitchensinkTest(){
+ projectExamplesSectionTest("Kitchensink", "jboss-as-kitchensink");
+ }
+
+ @Test
+ public void projectExamplesSectionHTML5Test(){
+ projectExamplesSectionTest("HTML5", "helloworld-html5");
+ }
+
/**
- * Tries to deploy all projects
+ * Tries to deploy all imported projects
*/
public void canBeDeployedTest(){
servers.show();
@@ -202,7 +247,7 @@
log.info("Project: "+projectName.getText()+" is properly deployed.");
}catch (WidgetNotFoundException wnfe){
//exception for Java EE Web project. It hase 4 projects, multi, multi-ear, multi-ejb and multi-web.
- if (!projectName.getText().contains("multi")){
+ if (!projectName.getText().contains("JavaEEProject")){
fail("Project <"+projectName.getText()+"> is not deployed on server correctly");
}
}
@@ -214,6 +259,10 @@
bot.sleep(Long.MAX_VALUE);
}
+
+ private void checkExample(SWTFormsBotExt formsBot, String formText, boolean readme){
+ checkExample(formsBot, formText, readme, null, null);
+ }
/**
*
@@ -222,8 +271,8 @@
* @param readme true if readme should be shown
*/
- private void checkExample(SWTFormsBotExt formsBot, String formText, boolean readme){
- checkExample(formsBot, formText, readme, null);
+ private void checkExample(SWTFormsBotExt formsBot, String formText, boolean readme, String projectName){
+ checkExample(formsBot, formText, readme, projectName, null);
}
/**
@@ -234,7 +283,7 @@
* @param readmeFileName
*/
- private void checkExample(SWTFormsBotExt formsBot, String formText, boolean readme, String readmeFileName){
+ protected void checkExample(SWTFormsBotExt formsBot, String formText, boolean readme, String projectName, String readmeFileName){
problems.show();
if (formsBot==null){
bot.hyperlink(formText).click();
@@ -248,18 +297,23 @@
}
bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
SWTBotWizard wizard = new SWTBotWizard(bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).widget);
- wizard.next();
- if (wizard.canNext()){
- // bot.comboBox(2).setSelection(1);
- /*try{
+ if (formsBot == null){
+ bot.comboBox(0).setSelection(1); //Target runtime combobox
+ try{
bot.link();
fail("There is something wrong with maven repo. Message: \n"+bot.link().getText());
}catch (WidgetNotFoundException ex){
//everything fine
- }*/
+ }
+ //bot.checkBox(0); //Create a blank project checkbox
wizard.next();
+ bot.comboBox().setText(formText.replaceAll("\\s", ""));
+ if (wizard.canNext()) wizard.next();
+ wizard.finishWithWait();
+ }else{
+ while (wizard.canNext()) wizard.next();
+ wizard.finishWithWait();
}
- wizard.finishWithWait();
String readmeText = bot.checkBox(1).getText();
assertFalse("Quick fix should not be enabled (Everything should be fine)", bot.checkBox(0).isEnabled());
if (readme){
12 years, 3 months
JBoss Tools SVN: r44419 - trunk/documentation.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-10-11 03:24:58 -0400 (Thu, 11 Oct 2012)
New Revision: 44419
Removed:
trunk/documentation/JBoss_Tools_Reference_Guide_Template/
trunk/documentation/jboss-tools-docs-archetype/
trunk/documentation/jbosstools-docbook-xslt/
trunk/documentation/jbosstools-jdocbook-style/
Log:
updated to remove unused files
12 years, 3 months
JBoss Tools SVN: r44418 - trunk/esb/plugins/org.jboss.tools.esb.validator.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-10-10 18:54:12 -0400 (Wed, 10 Oct 2012)
New Revision: 44418
Removed:
trunk/esb/plugins/org.jboss.tools.esb.validator/images/
Modified:
trunk/esb/plugins/org.jboss.tools.esb.validator/build.properties
Log:
empty images folder removed. build.properties updated to fix compilation errors after git migration.
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/build.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/build.properties 2012-10-10 22:00:39 UTC (rev 44417)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/build.properties 2012-10-10 22:54:12 UTC (rev 44418)
@@ -3,8 +3,7 @@
META-INF/,\
plugin.properties,\
about.html,\
- .,\
- images/
+ .
jars.compile.order = .
src.includes = src/,\
images/,\
12 years, 3 months
JBoss Tools SVN: r44417 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui: wizards/project and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-10-10 18:00:39 -0400 (Wed, 10 Oct 2012)
New Revision: 44417
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java
Log:
JBIDE-12823
https://issues.jboss.org/browse/JBIDE-12823
Runtime is set to data model. Operation of project creation is run with fork=true and cancelable=false, as in New Dynamic Wep project wizard.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2012-10-10 21:44:01 UTC (rev 44416)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2012-10-10 22:00:39 UTC (rev 44417)
@@ -414,6 +414,13 @@
wcco.setDataModel(dataModel);
dataModel.setProperty(IProjectCreationPropertiesNew.PROJECT_NAME, projectName);
dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
+ String runtimeName = getProperty(WebNatureOperation.RUNTIME_NAME);
+ if(runtimeName != null && runtimeName.length() > 0) {
+ Object o = findFacetRuntime(null);
+ if(o != null) {
+ dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, o);
+ }
+ }
if(!isDefaultLocation(projectLocation, true)) {
dataModel.setProperty(IProjectCreationPropertiesNew.USE_DEFAULT_LOCATION, Boolean.FALSE);
dataModel.setProperty(IProjectCreationPropertiesNew.USER_DEFINED_LOCATION, projectLocation);
@@ -490,7 +497,7 @@
if(wcco != null) {
wcco.execute(monitor, null);
}
- new RuntimeJob().schedule();
+// new RuntimeJob().runInWorkspace(monitor);
} catch (ExecutionException e) {
WebUiPlugin.getPluginLog().logError(e);
}
@@ -593,11 +600,10 @@
String runtimeName = getProperty(WebNatureOperation.RUNTIME_NAME);
if(runtimeName == null) return null;
if(runtime != null) runtimeName = runtime.getName();
- Set set = RuntimeManager.getRuntimes();
- Iterator it = set.iterator();
- while(it.hasNext()) {
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime r = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)it.next();
- if(runtimeName.equals(r.getName())) return r;
+ for(org.eclipse.wst.common.project.facet.core.runtime.IRuntime r: RuntimeManager.getRuntimes()) {
+ if(runtimeName.equals(r.getName())) {
+ return r;
+ }
}
return null;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java 2012-10-10 21:44:01 UTC (rev 44416)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java 2012-10-10 22:00:39 UTC (rev 44417)
@@ -63,7 +63,7 @@
IRunnableWithProgress runnable = createOperation();
IRunnableWithProgress op = new WorkspaceModifyDelegatingOperation(runnable);
try {
- getContainer().run(false, true, op);
+ getContainer().run(true, false, op);
BasicNewProjectResourceWizard.updatePerspective(fConfigElement);
BasicNewResourceWizard.selectAndReveal(context.getProject(), ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow());
if(runnable instanceof WebNatureOperation && ((WebNatureOperation)runnable).isCancelled()) {
12 years, 3 months
JBoss Tools SVN: r44416 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-10-10 17:44:01 -0400 (Wed, 10 Oct 2012)
New Revision: 44416
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java
Log:
JBIDE-12781
https://issues.jboss.org/browse/JBIDE-12781
Test is added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java 2012-10-10 20:45:36 UTC (rev 44415)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java 2012-10-10 21:44:01 UTC (rev 44416)
@@ -13,7 +13,6 @@
import org.jboss.tools.jsf.web.helpers.context.NewProjectWizardContext;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
import org.jboss.tools.test.util.ResourcesUtils;
-import org.jboss.tools.test.util.WorkbenchUtils;
import junit.framework.TestCase;
@@ -49,6 +48,7 @@
XModelObject facesConfig = nature.getModel().getByPath("/faces-config.xml");
assertNotNull(facesConfig);
+ assertEquals("1.2", facesConfig.getAttributeValue("version"));
XModelObject userBean = facesConfig.getChildByPath("Managed Beans/user");
assertNotNull(userBean);
} finally {
@@ -56,6 +56,40 @@
}
}
+ public void testNewJSFProject21Operation() throws Exception {
+ try {
+ NewProjectWizardContext context = new NewProjectWizardContext();
+ IProject project = getProjectHandle();
+ context.setProject(project);
+ IPath defaultPath = ModelUIPlugin.getWorkspace().getRoot().getLocation();
+ IPath locationPath = defaultPath.append(PROJECT_NAME);
+ context.setServletVersion("2.5");
+ context.setProjectLocation(locationPath.toOSString());
+ context.setProjectTemplate("JSFKickStartWithoutLibs");
+ context.setJSFVersion("JSF 2.1");
+
+ JSFProjectCreationOperation operation = new JSFProjectCreationOperation(context);
+ IWorkbenchWindow window = JsfUiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
+ window.run(false, false, operation);
+
+ IModelNature nature = EclipseResourceUtil.getModelNature(project);
+ assertNotNull(nature);
+ XModelObject webxml = nature.getModel().getByPath("/web.xml");
+ assertNotNull(webxml);
+
+ XModelObject[] s = WebAppHelper.getServlets(webxml);
+ assertTrue(s.length > 0);
+ String servletName = s[0].getAttributeValue("servlet-name");
+ assertEquals("Faces Servlet", servletName);
+
+ XModelObject facesConfig = nature.getModel().getByPath("/faces-config.xml");
+ assertNotNull(facesConfig);
+ assertEquals("2.1", facesConfig.getAttributeValue("version"));
+ } finally {
+ ResourcesUtils.deleteProject(PROJECT_NAME);
+ }
+ }
+
private IProject getProjectHandle() {
return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
}
12 years, 3 months
JBoss Tools SVN: r44415 - in trunk: common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-10-10 16:45:36 -0400 (Wed, 10 Oct 2012)
New Revision: 44415
Added:
trunk/common/plugins/org.jboss.tools.common.model.ui/images/xstudio/editors/taglibs_attribute.gif
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIImages.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddAttributeMarkerResolution.java
Log:
"Add missing required attribute(s)" quick fix for "Missing required attribute" WTP problem marker https://issues.jboss.org/browse/JBIDE-12390
Added: trunk/common/plugins/org.jboss.tools.common.model.ui/images/xstudio/editors/taglibs_attribute.gif
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.model.ui/images/xstudio/editors/taglibs_attribute.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIImages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIImages.java 2012-10-10 19:33:54 UTC (rev 44414)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIImages.java 2012-10-10 20:45:36 UTC (rev 44415)
@@ -41,7 +41,9 @@
public static String JAVA_PACKAGE = "java/package.gif"; //$NON-NLS-1$
public static String TAGLIB_FILE = "editors/taglibs_file.gif"; //$NON-NLS-1$
-
+
+ public static String TAGLIB_ATTRIBUTE = "editors/taglibs_attribute.gif"; //$NON-NLS-1$
+
// this blok staye witout changes for compatibility
private static ModelUIImages INSTANCE;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddAttributeMarkerResolution.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddAttributeMarkerResolution.java 2012-10-10 19:33:54 UTC (rev 44414)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddAttributeMarkerResolution.java 2012-10-10 20:45:36 UTC (rev 44415)
@@ -89,7 +89,7 @@
@Override
public Image getImage() {
- return CommonUIPlugin.getImageDescriptorRegistry().get(ModelUIImages.getImageDescriptor(ModelUIImages.TAGLIB_FILE));
+ return CommonUIPlugin.getImageDescriptorRegistry().get(ModelUIImages.getImageDescriptor(ModelUIImages.TAGLIB_ATTRIBUTE));
}
@Override
12 years, 3 months
JBoss Tools SVN: r44413 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-10-10 14:20:42 -0400 (Wed, 10 Oct 2012)
New Revision: 44413
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
Log:
JBIDE-12827 - Project Example section behaves weirdly in JBoss Central
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2012-10-10 13:35:54 UTC (rev 44412)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2012-10-10 18:20:42 UTC (rev 44413)
@@ -216,8 +216,6 @@
private void createBlogsSection(FormToolkit toolkit, Composite parent) {
blogsSection = createSection(toolkit, parent, "Blogs", ExpandableComposite.TITLE_BAR|ExpandableComposite.EXPANDED|ExpandableComposite.TWISTIE);
GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
- //gd.widthHint = 350;
- //gd.heightHint = 100;
blogsSection.setLayoutData(gd);
createBlogsToolbar(toolkit, blogsSection);
@@ -269,8 +267,6 @@
private void createNewsSection(FormToolkit toolkit, Composite parent) {
newsSection = createSection(toolkit, parent, "News", ExpandableComposite.TITLE_BAR|ExpandableComposite.EXPANDED|ExpandableComposite.TWISTIE);
GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
- //gd.widthHint = 350;
- //gd.heightHint = 100;
newsSection.setLayoutData(gd);
createNewsToolbar(toolkit, newsSection);
@@ -360,7 +356,7 @@
};
blogsWarning.setId(BLOGS_WARNING_ID);
blogsWarning.setActionDefinitionId(BLOGS_WARNING_ID);
- //blogsWarning.setEnabled(false);
+
blogsToolBarManager.add(blogsWarning);
setItemVisible(blogsToolBarManager, BLOGS_WARNING_ID, false);
@@ -392,7 +388,7 @@
};
newsWarning.setId(NEWS_WARNING_ID);
newsWarning.setActionDefinitionId(NEWS_WARNING_ID);
- //newsWarning.setEnabled(false);
+
newsToolBarManager.add(newsWarning);
setItemVisible(newsToolBarManager, NEWS_WARNING_ID, false);
@@ -424,8 +420,6 @@
private void createTutorialsSection(FormToolkit toolkit, Composite parent) {
tutorialsSection = createSection(toolkit, parent, "Project Examples", ExpandableComposite.TITLE_BAR|ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED);
GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
- //gd.widthHint = 350;
- //gd.heightHint = 100;
tutorialsSection.setLayoutData(gd);
createTutorialsToolbar(toolkit, tutorialsSection);
@@ -444,11 +438,6 @@
tutorialScrollComposite.setExpandVertical(true);
tutorialScrollComposite.setExpandHorizontal(true);
tutorialScrollComposite.setAlwaysShowScrollBars(false);
-// tutorialScrollComposite.addControlListener(new ControlAdapter() {
-// public void controlResized(ControlEvent e) {
-// recomputeScrollComposite(tutorialScrollComposite, tutorialPageBook);
-// }
-// });
tutorialsNoteText = createNoteText(toolkit, tutorialPageBook);
tutorialsLoadingComposite = createLoadingComposite(toolkit, tutorialPageBook);
@@ -513,11 +502,8 @@
projectsSection.setText("Create Projects");
projectsSection.setLayout(new GridLayout());
GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
- //gd.widthHint = 350;
- //gd.heightHint = 100;
projectsSection.setLayoutData(gd);
-
Composite headerComposite = toolkit.createComposite(projectsSection, SWT.NONE);
RowLayout rowLayout = new RowLayout();
rowLayout.marginTop = 0;
@@ -676,8 +662,6 @@
public void createDocumentationSection(FormToolkit toolkit, Composite parent) {
documentationSection = createSection(toolkit, parent, "Documentation", ExpandableComposite.TITLE_BAR|ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED);
GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
- //gd.widthHint = 350;
- //gd.heightHint = 100;
documentationSection.setLayoutData(gd);
documentationComposite = toolkit.createComposite(documentationSection);
@@ -887,43 +871,52 @@
public void refreshTutorials() {
RefreshTutorialsJob job = RefreshTutorialsJob.INSTANCE;
if (job.getException() != null) {
- showException(tutorialPageBook, tutorialsExceptionText, job.getException());
+ showException(tutorialPageBook, tutorialsExceptionText,
+ job.getException());
return;
}
- Map<ProjectExampleCategory, List<ProjectExample>> categories = job.getTutorialCategories();
+ Map<ProjectExampleCategory, List<ProjectExample>> categories = job
+ .getTutorialCategories();
if (categories == null || categories.size() == 0) {
- showNote(tutorialPageBook, tutorialsNoteText, tutorialScrollComposite);
+ showNote(tutorialPageBook, tutorialsNoteText,
+ tutorialScrollComposite);
return;
}
showTutorials(categories);
+ resize(true);
}
- private void showTutorials(Map<ProjectExampleCategory, List<ProjectExample>> categories) {
+ private void showTutorials(
+ Map<ProjectExampleCategory, List<ProjectExample>> categories) {
disposeChildren(tutorialsComposite);
- List<ProjectExampleCategory> sortedCategories = new ArrayList<ProjectExampleCategory>(categories.keySet());
+ List<ProjectExampleCategory> sortedCategories = new ArrayList<ProjectExampleCategory>(
+ categories.keySet());
Collections.sort(sortedCategories);
for (final ProjectExampleCategory category : sortedCategories) {
- int style = ExpandableComposite.TITLE_BAR|ExpandableComposite.TWISTIE;
+ int style = ExpandableComposite.TITLE_BAR
+ | ExpandableComposite.TWISTIE;
if (expandedCategories.contains(category)) {
- style|=ExpandableComposite.EXPANDED;
+ style |= ExpandableComposite.EXPANDED;
}
-
- final CategoryExpandableComposite categoryComposite = new CategoryExpandableComposite(tutorialsComposite, toolkit.getOrientation(),
- style);
-
+
+ final CategoryExpandableComposite categoryComposite = new CategoryExpandableComposite(
+ tutorialsComposite, toolkit.getOrientation(), style);
+
categoryComposite.setFont(getBoldFont(categoryComposite.getFont()));
-
- categoryComposite.setTitleBarForeground(toolkit.getColors().getColor(IFormColors.TB_TOGGLE));
+
+ categoryComposite.setTitleBarForeground(toolkit.getColors()
+ .getColor(IFormColors.TB_TOGGLE));
categoryComposite.setText(category.getName());
-
+
GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
categoryComposite.setLayoutData(gd);
categoryComposite.setLayout(new GridLayout());
- final Composite composite = toolkit.createComposite(categoryComposite);
+ final Composite composite = toolkit
+ .createComposite(categoryComposite);
gd = new GridData(SWT.FILL, SWT.FILL, false, false);
composite.setLayoutData(gd);
composite.setLayout(new GridLayout(1, false));
-
+
categoryComposite.addExpansionListener(new ExpansionAdapter() {
public void expansionStateChanged(ExpansionEvent e) {
if (e.getState()) {
@@ -938,18 +931,19 @@
displayTutorialLinks(categories.get(category), composite, true);
categoryComposite.setClient(composite);
String description = category.getDescription();
- if (description != null && !description.isEmpty() && categoryComposite.getControl() != null && !categoryComposite.getControl().isDisposed()) {
- final DescriptionToolTip toolTip = new DescriptionToolTip(categoryComposite.getControl(), description);
- toolTip.activate();
+ if (description != null && !description.isEmpty()
+ && categoryComposite.getControl() != null
+ && !categoryComposite.getControl().isDisposed()) {
+ final DescriptionToolTip toolTip = new DescriptionToolTip(
+ categoryComposite.getControl(), description);
+ toolTip.activate();
}
}
-
+
tutorialPageBook.showPage(tutorialsComposite);
tutorialPageBook.layout(true, true);
form.reflow(true);
- //form.redraw();
resize();
- //recomputeScrollComposite(tutorialScrollComposite, tutorialPageBook);
}
private Font getBoldFont(Font font) {
@@ -999,8 +993,6 @@
NewProjectExamplesWizard2 wizard = new NewProjectExamplesWizard2(tutorial);
WizardDialog dialog = new WizardDialog(getSite().getShell(), wizard);
dialog.open();
- //ProjectExamplesDialog dialog = new ProjectExamplesDialog(getSite().getShell(), tutorial);
- //dialog.open();
refreshTutorials();
}
}
@@ -1078,7 +1070,6 @@
pageBook.showPage(composite);
pageBook.layout(true, true);
form.reflow(true);
- //form.redraw();
recomputeScrollComposite(scrollable, pageBook);
resize();
}
@@ -1099,11 +1090,11 @@
}
oldSize = size;
GridData gd;
- int widthHint = size.x/2 - 20;
+ int widthHint = size.x / 2 - 20;
gd = (GridData) newsSection.getLayoutData();
if (newsSection.isExpanded()) {
if (blogsSection.isExpanded()) {
- gd.heightHint = size.y/2 - 20;
+ gd.heightHint = size.y / 2 - 20;
} else {
gd.heightHint = size.y - 40;
}
@@ -1112,56 +1103,57 @@
}
gd.widthHint = widthHint;
gd.grabExcessVerticalSpace = false;
-
+
gd = (GridData) blogsSection.getLayoutData();
if (blogsSection.isExpanded()) {
if (newsSection.isExpanded()) {
- gd.heightHint = size.y/2 - 20;
+ gd.heightHint = size.y / 2 - 20;
} else {
gd.heightHint = size.y - 40;
}
} else {
gd.heightHint = 20;
}
-
+
gd.widthHint = widthHint;
gd.grabExcessVerticalSpace = false;
-
+
gd = (GridData) documentationSection.getLayoutData();
- //gridData.heightHint = size.y - 40;
+
gd.widthHint = widthHint;
gd.grabExcessVerticalSpace = false;
-
+
gd = (GridData) settingsSection.getLayoutData();
gd.widthHint = widthHint;
gd.grabExcessVerticalSpace = false;
-
+
gd = (GridData) projectsSection.getLayoutData();
- //gridData.heightHint = size.y - 40;
+
gd.widthHint = widthHint;
gd.grabExcessVerticalSpace = false;
-
+
gd = (GridData) tutorialsSection.getLayoutData();
- Point computedSize = tutorialPageBook.computeSize(widthHint, SWT.DEFAULT);
-
- if (computedSize.y > (size.y/3)) {
- gd.heightHint = size.y/3;
+ Point computedSize = tutorialPageBook.computeSize(widthHint,
+ SWT.DEFAULT);
+
+ if (computedSize.y > (size.y / 3)) {
+ gd.heightHint = size.y / 3;
} else {
gd.heightHint = SWT.DEFAULT;
}
gd.widthHint = widthHint;
gd.grabExcessVerticalSpace = false;
-
+
computedSize = tutorialPageBook.computeSize(widthHint, SWT.DEFAULT);
-
+
tutorialScrollComposite.setMinSize(widthHint - 20, computedSize.y);
-
+
recomputeScrollComposite(blogsScrollComposite, blogsPageBook);
recomputeScrollComposite(newsScrollComposite, newsPageBook);
-
+
form.layout(true, true);
form.reflow(true);
-
+
}
private class RefreshBlogsJobChangeListener implements IJobChangeListener {
12 years, 3 months
JBoss Tools SVN: r44412 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-10-10 09:35:54 -0400 (Wed, 10 Oct 2012)
New Revision: 44412
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java
Log:
Improve waiting for events to finish
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java 2012-10-10 12:03:04 UTC (rev 44411)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java 2012-10-10 13:35:54 UTC (rev 44412)
@@ -5,6 +5,7 @@
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.test.WidgetVariables;
public abstract class JSF2AbstractRefactorTest extends JSFAutoTestCase {
@@ -82,13 +83,14 @@
SWTBotEclipseEditor editor = bot.editorByTitle(
JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$
editor.setFocus();
- bot.sleep(2000);
+ bot.sleep(Timing.time3S());
bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$//$NON-NLS-2$
- bot.sleep(2000);
+ bot.sleep(Timing.time3S());
editor.setText(loadFileContent("refactor/jsf2TestPage.html")); //$NON-NLS-1$
- bot.sleep(2000);
- editor.saveAndClose();
+ bot.sleep(Timing.time3S());
+ editor.save();
+ editor.close();
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java 2012-10-10 12:03:04 UTC (rev 44411)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java 2012-10-10 13:35:54 UTC (rev 44412)
@@ -3,7 +3,9 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.test.WidgetVariables;
public class JSF2MoveParticipantTest extends JSF2AbstractRefactorTest {
@@ -38,14 +40,16 @@
tree
.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
bot.menu("Refactor").menu("Move...").click(); //$NON-NLS-1$ //$NON-NLS-2$
- innerBot = bot.shell("Move").bot(); //$NON-NLS-1$
+ SWTBotShell shMove = bot.shell("Move").activate();
+ innerBot = shMove.bot(); //$NON-NLS-1$
tree = innerBot.tree();
tree
.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
bot.button("Preview >").click(); //$NON-NLS-1$
checkPreview();
bot.button("OK").click(); //$NON-NLS-1$
- delay();
+ bot.sleep(Timing.time3S());
+ util.waitForNonIgnoredJobs(Timing.time3S());
}
private void createDistResFolder() throws Exception {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2012-10-10 12:03:04 UTC (rev 44411)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2012-10-10 13:35:54 UTC (rev 44412)
@@ -3,6 +3,7 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.test.WidgetVariables;
public class JSF2RenameParticipantTest extends JSF2AbstractRefactorTest {
@@ -21,6 +22,7 @@
tree
.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
bot.menu("Refactor").menu("Rename...").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.shell(IDELabel.Shell.RENAME_RESOURCE).activate();
bot.textWithLabel("New name:").setText("echo1.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("Preview >").click(); //$NON-NLS-1$
checkPreview();
12 years, 3 months
JBoss Tools SVN: r44411 - in trunk/examples/plugins: org.jboss.tools.project.examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-10 08:03:04 -0400 (Wed, 10 Oct 2012)
New Revision: 44411
Modified:
trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.properties
trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml
trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
Log:
JBIDE-12554 Clean up project examples sites from current JBT/JBDS wizard
Modified: trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.properties
===================================================================
--- trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.properties 2012-10-10 11:57:27 UTC (rev 44410)
+++ trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.properties 2012-10-10 12:03:04 UTC (rev 44411)
@@ -1,8 +1,6 @@
BundleVendor = JBoss by Red Hat
BundleName = JBoss Tools Community Project Examples
-JBoss_Tools_Community_Examples = JBoss Tools 3.1 Community Examples
-JBoss_Tools_Community_Maven_Examples = JBoss Tools 3.2 Community Maven Examples
-JBoss_Tools_4x_Community_Maven_Examples = JBoss Tools 4.0 Community Maven Examples
+JBoss_Tools_Community_Examples = JBoss Tools Community Examples
+JBoss_Tools_Community_Maven_Examples = JBoss Tools Community Maven Examples
JBoss_Tools_Community_BPEL_Examples=JBoss Tools Community BPEL Examples
-JBoss_Tools_32_Community_Examples=JBoss Tools 3.2 Community_Examples
-JBoss_Tools_40_Community_GateIn_Portal_Examples =JBoss Tools 4.0 Community GateIn Portal Examples
\ No newline at end of file
+JBoss_Tools_Community_GateIn_Portal_Examples =JBoss Tools Community GateIn Portal Examples
\ No newline at end of file
Modified: trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml
===================================================================
--- trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml 2012-10-10 11:57:27 UTC (rev 44410)
+++ trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml 2012-10-10 12:03:04 UTC (rev 44411)
@@ -5,15 +5,17 @@
<extension
point="org.jboss.tools.project.examples.projectExamplesXml"
name="%JBoss_Tools_Community_Examples">
- <url>http://download.jboss.org/jbosstools/examples/project-examples-community-...</url>
+ <url>http://download.jboss.org/jbosstools/examples/project-examples-community-...</url>
<experimental>false</experimental>
</extension>
+ <!--
<extension
point="org.jboss.tools.project.examples.projectExamplesXml"
name="%JBoss_Tools_32_Community_Examples">
<url>http://download.jboss.org/jbosstools/examples/project-examples-3.2.xml</url>
<experimental>false</experimental>
</extension>
+
<extension
name="%JBoss_Tools_Community_BPEL_Examples"
point="org.jboss.tools.project.examples.projectExamplesXml">
@@ -24,18 +26,13 @@
false
</experimental>
</extension>
+ -->
<extension
point="org.jboss.tools.project.examples.projectExamplesXml"
name="%JBoss_Tools_Community_Maven_Examples">
- <url>http://download.jboss.org/jbosstools/examples/project-examples-maven-3.2.xml</url>
+ <url>http://download.jboss.org/jbosstools/examples/project-examples-maven-4.0....</url>
<experimental>false</experimental>
</extension>
- <extension
- point="org.jboss.tools.project.examples.projectExamplesXml"
- name="%JBoss_Tools_4x_Community_Maven_Examples">
- <url>http://download.jboss.org/jbosstools/examples/project-examples-maven-4.0....</url>
- <experimental>false</experimental>
- </extension>
<extension
point="org.jboss.tools.project.examples.categories"
@@ -45,9 +42,9 @@
<extension
point="org.jboss.tools.project.examples.projectExamplesXml"
- name="%JBoss_Tools_40_Community_GateIn_Portal_Examples">
+ name="%JBoss_Tools_Community_GateIn_Portal_Examples">
<url>https://github.com/downloads/ppalaga/gatein-portal-quickstart/project-exa...</url>
- <experimental>true</experimental>
+ <experimental>false</experimental>
</extension>
</plugin>
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2012-10-10 11:57:27 UTC (rev 44410)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2012-10-10 12:03:04 UTC (rev 44411)
@@ -76,16 +76,15 @@
<extension
point="org.jboss.tools.project.examples.projectExamplesXml"
- name="Shared Examples">
- <url>http://download.jboss.org/jbosstools/examples/project-examples-shared-4.0...</url>
-
+ name="JBoss Featured Examples">
+ <url>http://download.jboss.org/jbosstools/examples/project-examples-shared-4.0...</url>
<experimental>false</experimental>
</extension>
<extension
point="org.jboss.tools.project.examples.categories"
name="Project Examples Categories">
- <url>http://download.jboss.org/jbosstools/examples/project-examples-category-3...</url>
+ <url>http://download.jboss.org/jbosstools/examples/project-examples-category-4...</url>
</extension>
<extension
12 years, 3 months