JBoss Tools SVN: r36134 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: eap and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-11-02 11:54:41 -0400 (Wed, 02 Nov 2011)
New Revision: 36134
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java
Log:
Correction WS test against JBT 3.3.0 M4
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2011-11-02 15:39:08 UTC (rev 36133)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2011-11-02 15:54:41 UTC (rev 36134)
@@ -11,6 +11,8 @@
package org.jboss.tools.ws.ui.bot.test;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ws.ui.bot.test.eap.EAPFromJavaTest;
+import org.jboss.tools.ws.ui.bot.test.eap.EAPFromWSDLTest;
import org.jboss.tools.ws.ui.bot.test.jbt.SampleWSTest;
import org.jboss.tools.ws.ui.bot.test.jbt.WsTesterTest;
import org.jboss.tools.ws.ui.bot.test.wtp.BottomUpWSTest;
@@ -44,7 +46,9 @@
BottomUpWSTest.class,
TopDownWSTest.class,
WsClientTest.class,
- WsTesterTest.class
+ WsTesterTest.class,
+ EAPFromJavaTest.class,
+ EAPFromWSDLTest.class
})
public class WSAllBotTests {
}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java 2011-11-02 15:39:08 UTC (rev 36133)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java 2011-11-02 15:54:41 UTC (rev 36134)
@@ -24,6 +24,7 @@
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ws.ui.bot.test.WSAllBotTests;
import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewFileWizardAction;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Wizard;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level;
@@ -39,7 +40,7 @@
@Require(server=
@Server(type = ServerType.EAP), perspective = "Java EE")
@RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ EAPCompAllTests.class})
+@SuiteClasses({ WSAllBotTests.class, EAPCompAllTests.class })
public class EAPFromJavaTest extends WSTestBase {
@@ -145,8 +146,12 @@
w.bot().textWithLabel("Enter or select the parent folder:").setText(getWsClientProjectName() + "/WebContent");
w.finish();
bot.sleep(TIME_5S);
- bot.activeShell().bot().button("Skip").click();
- bot.sleep(TIME_5S);
+ /**
+ * Workaround for 4.x branch
+ *
+ * bot.activeShell().bot().button("Skip").click();
+ * bot.sleep(TIME_5S);
+ */
SWTBotEclipseEditor st = bot.editorByTitle("index.jsp").toTextEditor();
st.selectRange(0, 0, st.getText().length());
st.setText(readStream(EAPFromJavaTest.class.getResourceAsStream("/resources/jbossws/index.jsp.ws")));
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-11-02 15:39:08 UTC (rev 36133)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-11-02 15:54:41 UTC (rev 36134)
@@ -34,6 +34,7 @@
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ws.ui.bot.test.WSAllBotTests;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level;
import org.jboss.tools.ws.ui.bot.test.wtp.TopDownWSTest;
import org.jboss.tools.ws.ui.bot.test.wtp.WSTestBase;
@@ -47,7 +48,7 @@
@Require(server = @Server(type = ServerType.EAP), perspective = "Java EE")
@RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ EAPCompAllTests.class })
+@SuiteClasses({ WSAllBotTests.class, EAPCompAllTests.class })
public class EAPFromWSDLTest extends WSTestBase {
private static final Logger L = Logger.getLogger(EAPFromWSDLTest.class
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-11-02 15:39:08 UTC (rev 36133)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-11-02 15:54:41 UTC (rev 36134)
@@ -136,7 +136,7 @@
}
private void checkRESTService(String project, String svcName, String svcPkg, String svcClass, String msgContent, String appCls) {
- checkService(Type.REST, project, svcName, svcPkg, svcClass, msgContent, appCls);
+ checkService(Type.REST, project, svcName, svcPkg, svcClass, msgContent, appCls);
checkRestSupport(project,svcName);
}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java 2011-11-02 15:39:08 UTC (rev 36133)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java 2011-11-02 15:54:41 UTC (rev 36134)
@@ -15,6 +15,7 @@
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ws.ui.bot.test.WSAllBotTests;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@@ -93,12 +94,12 @@
setLevel(Slider_Level.TEST);
topDownWS();
}
-
-// @Test
-// public void testDefaultPkg() {
-// setLevel(Slider_Level.ASSEMBLE);
-// topDownWS(null);
-// }
+ @Ignore
+ @Test
+ public void testDefaultPkg() {
+ setLevel(Slider_Level.ASSEMBLE);
+ topDownWS(null);
+ }
private void topDownWS() {
topDownWS("ws." + getWsName().toLowerCase());
@@ -114,6 +115,6 @@
break;
}
assertServiceDeployed(getWSDLUrl(), 10000);
-// servers.removeAllProjectsFromServer(configuredState.getServer().name);
+ servers.removeAllProjectsFromServer(configuredState.getServer().name);
}
}
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r36133 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: openon and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-11-02 11:39:08 -0400 (Wed, 02 Nov 2011)
New Revision: 36133
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDIConfigurationPresetTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIFindObserverForEventTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
Log:
CDIConfigurationPresetTest was added
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-02 10:20:44 UTC (rev 36132)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-02 15:39:08 UTC (rev 36133)
@@ -18,6 +18,7 @@
import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIBase;
import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIUtil;
import org.jboss.tools.cdi.bot.test.wizard.CDIATWizardTest;
+import org.jboss.tools.cdi.bot.test.wizard.CDIConfigurationPresetTest;
import org.jboss.tools.cdi.bot.test.wizard.CDIPerspectiveTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.types.ViewType;
@@ -49,6 +50,7 @@
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
//CDIPerspectiveTest.class,
+ CDIConfigurationPresetTest.class,
CDIATWizardTest.class,
BeansEditorTest.class,
CDIQuickFixTest.class,
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2011-11-02 10:20:44 UTC (rev 36132)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2011-11-02 15:39:08 UTC (rev 36133)
@@ -13,7 +13,7 @@
import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIBase;
import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIUtil;
import org.jboss.tools.cdi.bot.test.wizard.CDIATWizardTest;
-import org.jboss.tools.cdi.bot.test.wizard.CDIPerspectiveTest;
+import org.jboss.tools.cdi.bot.test.wizard.CDIConfigurationPresetTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.types.ViewType;
import org.junit.BeforeClass;
@@ -41,8 +41,9 @@
* @author Jaroslav Jankovic
*/
@RunWith(RequirementAwareSuite.class)
-@SuiteClasses({
- //CDIPerspectiveTest.class,
+@SuiteClasses({
+ //CDIPerspectiveTest.class,
+ CDIConfigurationPresetTest.class,
CDIATWizardTest.class,
})
public class CDISmokeBotTests extends CDIBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIFindObserverForEventTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIFindObserverForEventTest.java 2011-11-02 10:20:44 UTC (rev 36132)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIFindObserverForEventTest.java 2011-11-02 15:39:08 UTC (rev 36133)
@@ -11,15 +11,8 @@
package org.jboss.tools.cdi.bot.test.openon;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
-import org.jboss.tools.cdi.bot.test.CDISmokeBotTests;
-import org.jboss.tools.cdi.bot.test.quickfix.CDIQuickFixTest;
import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIBase;
-import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIUtil;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
@@ -41,9 +34,9 @@
@SuiteClasses({ CDIAllBotTests.class })
public class CDIFindObserverForEventTest extends CDIBase {
- private static final Logger LOGGER = Logger.getLogger(CDIFindObserverForEventTest.class.getName());
+ //private static final Logger LOGGER = Logger.getLogger(CDIFindObserverForEventTest.class.getName());
private static final String PROJECT_NAME = "CDIProject";
- private static final String PACKAGE_NAME = "cdi";
+ //private static final String PACKAGE_NAME = "cdi";
@BeforeClass
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java 2011-11-02 10:20:44 UTC (rev 36132)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java 2011-11-02 15:39:08 UTC (rev 36133)
@@ -148,7 +148,7 @@
openOn("produceMethod", testedBean + ".java", "Open Bound Disposer");
assertTrue(getEd().toTextEditor().getSelection().equals("disposeMethod"));
}
-
+
@Test
public void testObserverOpenOn() {
createComponent(CDICOMPONENT.QUALIFIER, "Q1", PACKAGE_NAME, null);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java 2011-11-02 10:20:44 UTC (rev 36132)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java 2011-11-02 15:39:08 UTC (rev 36133)
@@ -148,6 +148,13 @@
new DynamicWebProjectWizard().setProjectName(projectName).finish();
util.waitForNonIgnoredJobs();
}
+
+ public static void createCDIProjectWithCDIPreset(SWTUtilExt util, String projectName) {
+ new NewFileWizardAction().run()
+ .selectTemplate("Web", "Dynamic Web Project").next();
+ new DynamicWebProjectWizard().setProjectName(projectName).setCDIPreset().finish();
+ util.waitForNonIgnoredJobs();
+ }
public static void addCDISupport(final SWTBotTree tree, SWTBotTreeItem item,
SWTBotExt bot, SWTUtilExt util) {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java 2011-11-02 10:20:44 UTC (rev 36132)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java 2011-11-02 15:39:08 UTC (rev 36133)
@@ -313,7 +313,7 @@
bot().button("Add...", 0).click();
SWTBotShell sh = bot().activeShell();
sh.bot().text().setText(intf);
- sh.bot().sleep(Timing.time2S());
+ sh.bot().sleep(Timing.time3S());
sh.bot().table().getTableItem(0).select();
sh.bot().button("OK").click();
setFocus();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-02 10:20:44 UTC (rev 36132)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-02 15:39:08 UTC (rev 36133)
@@ -59,6 +59,13 @@
public boolean canFinish() {
return canClick("Finish");
}
+
+ public Wizard setCDIPreset() {
+ bot().comboBoxInGroup("Configuration", 0).
+ setSelection("Dynamic Web Project with CDI (Context and Dependency Injection)");
+ return this;
+ }
+
protected void clickButton(String text) {
bot().button(text).click();
@@ -70,7 +77,7 @@
t.setFocus();
t.setText(text);
}
-
+
protected boolean canClick(String button) {
return bot().button(button).isEnabled();
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDIConfigurationPresetTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDIConfigurationPresetTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDIConfigurationPresetTest.java 2011-11-02 15:39:08 UTC (rev 36133)
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.bot.test.wizard;
+
+
+import java.util.logging.Logger;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
+import org.jboss.tools.cdi.bot.test.CDISmokeBotTests;
+import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIBase;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+* Test checks if CDI configuration preset sets CDI support correctly
+*
+* @author Jaroslav Jankovic
+*/
+
+@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses({ CDIAllBotTests.class , CDISmokeBotTests.class })
+public class CDIConfigurationPresetTest extends CDIBase {
+
+ private static final Logger LOGGER = Logger.getLogger(CDIConfigurationPresetTest.class.getName());
+ private static final String PROJECT_NAME = "CDIPresetProject";
+
+ @After
+ public void waitForJobs() {
+ jbt.deleteProject(PROJECT_NAME);
+ }
+
+ @Test
+ public void testCDIPreset() {
+ createCDIProjectWithCDIPreset(util, PROJECT_NAME);
+ LOGGER.info("Dynamic Web Project with CDI Configuration Preset created");
+ assertTrue(checkCDISupport(PROJECT_NAME));
+ }
+
+ private boolean checkCDISupport(String projectName) {
+ projectExplorer.selectProject(projectName);
+
+ SWTBotTree tree = projectExplorer.bot().tree();
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree);
+ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree,"Properties",false)).click();
+
+ bot.tree().expandNode("CDI (Context and Dependency Injection) Settings").select();
+ boolean isCDISupported = bot.checkBox().isChecked();
+ bot.button("Cancel").click();
+ return isCDISupported;
+ }
+
+
+}
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r36132 - in trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet: actions and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-11-02 06:20:44 -0400 (Wed, 02 Nov 2011)
New Revision: 36132
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/actions/ImportProjectExample.java
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/OpenFileInEditor.java
trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/OpenPreferencePage.java
trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunOnServer.java
trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunProjectExample.java
Log:
JBIDE-10082 Add documentation for project examples custom actions
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-11-02 09:40:49 UTC (rev 36131)
+++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/Activator.java 2011-11-02 10:20:44 UTC (rev 36132)
@@ -1,3 +1,13 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2011 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
package org.jboss.tools.project.examples.cheatsheet;
import org.eclipse.core.runtime.IStatus;
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-11-02 09:40:49 UTC (rev 36131)
+++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java 2011-11-02 10:20:44 UTC (rev 36132)
@@ -1,3 +1,13 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2011 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
package org.jboss.tools.project.examples.cheatsheet.actions;
import java.io.File;
@@ -25,8 +35,26 @@
import org.jboss.tools.project.examples.model.Project;
import org.jboss.tools.project.examples.model.ProjectUtil;
+/**
+ *
+ * <p>Action that imports project examples to workspace.</p>
+ *
+ * @author snjeza
+ *
+ */
public class ImportProjectExample extends Action implements ICheatSheetAction {
+ /**
+ * Execution of the action
+ *
+ * @param params
+ * Array of parameters
+ * index 0: projectName,
+ * index 1: included projects,
+ * index 2: the URL of the project example
+ * @param manager
+ * Cheatsheet Manager
+ */
public void run(String[] params, ICheatSheetManager manager) {
if(params == null || params[0] == null || params[1] == null || params[2] == null ) {
return;
Modified: 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 2011-11-02 09:40:49 UTC (rev 36131)
+++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/LaunchJUnitTest.java 2011-11-02 10:20:44 UTC (rev 36132)
@@ -1,3 +1,13 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2011 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
package org.jboss.tools.project.examples.cheatsheet.actions;
import org.eclipse.core.resources.IProject;
@@ -26,10 +36,27 @@
import org.jboss.tools.project.examples.cheatsheet.Messages;
import org.osgi.service.prefs.BackingStoreException;
+/**
+ *
+ * <p>Action that launches JUnit test.</p>
+ *
+ * @author snjeza
+ *
+ */
public class LaunchJUnitTest extends Action implements ICheatSheetAction {
private static final String ACTIVE_PROFILES = "activeProfiles"; //$NON-NLS-1$
+ /**
+ * Execution of the action
+ *
+ * @param params
+ * Array of parameters
+ * index 0: projectName,
+ * index 1: Maven profile,
+ * @param manager
+ * Cheatsheet Manager
+ */
public void run(String[] params, ICheatSheetManager manager) {
if (params == null || params[0] == null) {
return;
Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/OpenFileInEditor.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/OpenFileInEditor.java 2011-11-02 09:40:49 UTC (rev 36131)
+++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/OpenFileInEditor.java 2011-11-02 10:20:44 UTC (rev 36132)
@@ -1,3 +1,13 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2011 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
package org.jboss.tools.project.examples.cheatsheet.actions;
import org.eclipse.core.resources.IFile;
@@ -27,8 +37,25 @@
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
import org.jboss.tools.project.examples.cheatsheet.Messages;
+/**
+ *
+ * <p>Action that opens a file in an editor.</p>
+ *
+ * @author snjeza
+ *
+ */
public class OpenFileInEditor extends Action implements ICheatSheetAction {
+ /**
+ * Execution of the action
+ *
+ * @param params
+ * Array of parameters
+ * index 0: the file path,
+ * index 1,2: the range of the lines that will be selected
+ * @param manager
+ * Cheatsheet Manager
+ */
public void run(String[] params, ICheatSheetManager manager) {
if(params == null || params[0] == null ) {
return;
Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/OpenPreferencePage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/OpenPreferencePage.java 2011-11-02 09:40:49 UTC (rev 36131)
+++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/OpenPreferencePage.java 2011-11-02 10:20:44 UTC (rev 36132)
@@ -1,3 +1,13 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2011 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
package org.jboss.tools.project.examples.cheatsheet.actions;
import org.eclipse.jface.action.Action;
@@ -8,8 +18,24 @@
import org.eclipse.ui.cheatsheets.ICheatSheetManager;
import org.eclipse.ui.internal.dialogs.WorkbenchPreferenceDialog;
+/**
+ *
+ * <p>Action that opens a preferences page.</p>
+ *
+ * @author snjeza
+ *
+ */
public class OpenPreferencePage extends Action implements ICheatSheetAction {
+ /**
+ * Execution of the action
+ *
+ * @param params
+ * Array of parameters
+ * index 0: preferences page id
+ * @param manager
+ * Cheatsheet Manager
+ */
public void run(String[] params, ICheatSheetManager manager) {
if(params == null || params[0] == null) {
return;
Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunOnServer.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunOnServer.java 2011-11-02 09:40:49 UTC (rev 36131)
+++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunOnServer.java 2011-11-02 10:20:44 UTC (rev 36132)
@@ -1,3 +1,13 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2011 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
package org.jboss.tools.project.examples.cheatsheet.actions;
import org.eclipse.core.resources.IFile;
@@ -21,8 +31,25 @@
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.tools.project.examples.cheatsheet.Activator;
+/**
+ *
+ * <p>Action that runs an application on a server.</p>
+ *
+ * @author snjeza
+ *
+ */
public class RunOnServer extends Action implements ICheatSheetAction {
+ /**
+ * Execution of the action
+ *
+ * @param params
+ * Array of parameters
+ * index 0: projectName,
+ * index 1: a file path we want to mark as deployable.
+ * @param manager
+ * Cheatsheet Manager
+ */
public void run(String[] params, ICheatSheetManager manager) {
if(params == null || params[0] == null) {
return;
Modified: 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 2011-11-02 09:40:49 UTC (rev 36131)
+++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunProjectExample.java 2011-11-02 10:20:44 UTC (rev 36132)
@@ -1,3 +1,13 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2011 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
package org.jboss.tools.project.examples.cheatsheet.actions;
import java.util.ArrayList;
@@ -15,8 +25,24 @@
import org.jboss.tools.project.examples.model.Project;
import org.jboss.tools.project.examples.model.ProjectUtil;
+/**
+ *
+ * <p>Action that runs a project example.</p>
+ *
+ * @author snjeza
+ *
+ */
public class RunProjectExample extends Action implements ICheatSheetAction {
+ /**
+ * Execution of the action
+ *
+ * @param params
+ * Array of parameters
+ * index 0: <category>::<name> project example
+ * @param manager
+ * Cheatsheet Manager
+ */
public void run(String[] params, ICheatSheetManager manager) {
if(params == null || params[0] == null ) {
return;
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r36131 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-11-02 05:40:49 -0400 (Wed, 02 Nov 2011)
New Revision: 36131
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
Log:
https://issues.jboss.org/browse/JBIDE-9569 - VpeVisualDomBuilder.getNodeForUpdate was removed.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-11-02 09:24:58 UTC (rev 36130)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-11-02 09:40:49 UTC (rev 36131)
@@ -318,7 +318,7 @@
*/
public nsIDOMNode createNode(Node sourceNode,
nsIDOMNode visualOldContainer) throws VpeDisposeException {
-
+
boolean registerFlag = isCurrentMainDocument();
//it's check for initialization visualController,
//if we trying to process some event when controller
@@ -775,33 +775,14 @@
rebuildDom((Document) sourceNode);
break;
default:
- updateElement(getNodeForUpdate(sourceNode));
+ updateElement(sourceNode);
}
}
- // TODO Ssergey Vasilyev make a common code for figuring out
- // if it is need to update parent node or not
- private Node getNodeForUpdate(Node sourceNode) {
- /* Changing of <tr> or <td> tags can affect whole the table */
- Node sourceTable = getParentTable(sourceNode, 2);
- if (sourceTable != null) {
- return sourceTable;
- }
-
- /* Changing of an <option> tag can affect the parent select */
- Node sourceSelect = getParentSelect(sourceNode);
- if (sourceSelect != null) {
- return sourceSelect;
- }
-
- return sourceNode;
- }
-
private void updateElement(Node sourceNode) {
VpeElementMapping elementMapping = null;
VpeNodeMapping nodeMapping = domMapping.getNodeMapping(sourceNode);
if (nodeMapping instanceof VpeElementMapping) {
-
elementMapping = (VpeElementMapping) nodeMapping;
if (elementMapping != null && elementMapping.getTemplate() != null) {
Node updateNode = elementMapping.getTemplate()
@@ -809,7 +790,6 @@
elementMapping.getSourceNode(),
elementMapping.getVisualNode(),
elementMapping.getData());
-
/*
* special processing of "style" element
*
@@ -822,19 +802,23 @@
VpeStyleUtil.refreshStyleElement(this, elementMapping);
return;
}
- if (updateNode != null && updateNode != sourceNode) {
+ if ((updateNode != null) && (updateNode != sourceNode)) {
updateNode(updateNode);
return;
}
}
}
-
+ /*
+ * 1) Remove source node from mappings and lists.
+ */
nsIDOMNode visualOldNode = domMapping.remove(sourceNode);
getSourceNodes().remove(sourceNode);
-
if (sourceNode instanceof INodeNotifier) {
((INodeNotifier) sourceNode).removeAdapter(getSorceAdapter());
}
+ /*
+ * 2) Add new visual node for this source node.
+ */
if (visualOldNode != null) {
nsIDOMNode visualContainer = visualOldNode.getParentNode();
nsIDOMNode visualNextNode = visualOldNode.getNextSibling();
@@ -866,27 +850,6 @@
}
}
- private Node getParentTable(Node sourceNode, int depth) {
- Node parentNode = sourceNode.getParentNode();
- for (int i = 0; parentNode != null && i < depth; parentNode = parentNode
- .getParentNode(), i++) {
- if (HTML.TAG_TABLE.equalsIgnoreCase(parentNode.getNodeName())) {
- return parentNode;
- }
- }
- return null;
- }
-
- private Node getParentSelect(Node sourceNode) {
- if (HTML.TAG_OPTION.equalsIgnoreCase(sourceNode.getNodeName())) {
- Node parentNode = sourceNode.getParentNode();
- if (HTML.TAG_SELECT.equalsIgnoreCase(parentNode.getNodeName())) {
- return parentNode;
- }
- }
- return null;
- }
-
public void setCdataText(Node sourceNode) {
Node sourceParent = sourceNode.getParentNode();
if (sourceParent != null && sourceParent.getLocalName() != null) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2011-11-02 09:24:58 UTC (rev 36130)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2011-11-02 09:40:49 UTC (rev 36131)
@@ -526,17 +526,33 @@
}
return false;
}
+
@Override
- public Node getNodeForUpdate(VpePageContext pageContext, Node sourceNode, nsIDOMNode visualNode, Object data) {
+ public Node getNodeForUpdate(VpePageContext pageContext, Node sourceNode,
+ nsIDOMNode visualNode, Object data) {
+ Node nodeForUpdate = null;
+ String templateName = VpeTemplateManager.getInstance().getTemplateName(pageContext, sourceNode);
// TODO Sergey Vasilyev redevelop JSF's facet template
if (sourceNode.getNodeName().endsWith(":facet")) { //$NON-NLS-1$
- return sourceNode.getParentNode();
+ nodeForUpdate = sourceNode.getParentNode();
+ } else if ((HTML.TAG_TD.equalsIgnoreCase(templateName))
+ || (HTML.TAG_TR.equalsIgnoreCase(templateName))) {
+ Node parentNode = sourceNode.getParentNode();
+ for (int i = 0; parentNode != null && i < 2; parentNode = parentNode.getParentNode(), i++) {
+ if (HTML.TAG_TABLE.equalsIgnoreCase(parentNode.getNodeName())) {
+ nodeForUpdate = parentNode;
+ break;
+ }
+ }
+ } else if(HTML.TAG_OPTION.equalsIgnoreCase(templateName)) {
+ Node parentNode = sourceNode.getParentNode();
+ if (HTML.TAG_SELECT.equalsIgnoreCase(parentNode.getNodeName())) {
+ nodeForUpdate = parentNode;
+ }
+ } else if (creator != null) {
+ nodeForUpdate = creator.getNodeForUpdate(pageContext, sourceNode, visualNode, (Map<VpeTemplate,?>)data);
}
-
- if (creator != null) {
- return creator.getNodeForUpdate(pageContext, sourceNode, visualNode, (Map<VpeTemplate,?>)data);
- }
- return null;
+ return nodeForUpdate;
}
/* (non-Javadoc)
@@ -570,5 +586,5 @@
}
}
return null;
- }
+ }
}
\ No newline at end of file
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r36130 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-11-02 05:24:58 -0400 (Wed, 02 Nov 2011)
New Revision: 36130
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultMavenProjectExample.java
Log:
JBIDE-9926 Importing some of the BPEL Examples results in log error
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultMavenProjectExample.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultMavenProjectExample.java 2011-11-02 08:47:25 UTC (rev 36129)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultMavenProjectExample.java 2011-11-02 09:24:58 UTC (rev 36130)
@@ -104,7 +104,9 @@
for (ZipEntry directory:directories) {
IPath resourcePath = new Path(directory.getName());
try {
- workspace.getRoot().getFolder(resourcePath).create(false, true, null);
+ if (resourcePath.segmentCount() > 1 && !workspace.getRoot().getFolder(resourcePath).exists()) {
+ workspace.getRoot().getFolder(resourcePath).create(false, true, null);
+ }
} catch (Exception e) {
ProjectExamplesActivator.log(e);
}
@@ -167,7 +169,9 @@
for (ZipEntry directory:directories) {
IPath resourcePath = new Path(directory.getName());
try {
- workspace.getRoot().getFolder(resourcePath).create(false, true, null);
+ if (resourcePath.segmentCount() > 1 && !workspace.getRoot().getFolder(resourcePath).exists()) {
+ workspace.getRoot().getFolder(resourcePath).create(false, true, null);
+ }
} catch (Exception e) {
ProjectExamplesActivator.log(e);
}
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r36129 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-11-02 04:47:25 -0400 (Wed, 02 Nov 2011)
New Revision: 36129
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
Log:
Fixes for JBT 3.3.0.M4
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java 2011-11-02 04:23:47 UTC (rev 36128)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java 2011-11-02 08:47:25 UTC (rev 36129)
@@ -85,6 +85,7 @@
csf.upClicked();
}
});
+ bot.sleep(Timing.time2S());
assertVisualEditorContains(webBrowser, "INPUT", null, null, MinMaxPanesTest.TEST_PAGE_NAME);
jspTextEditor.setFocus();
jspTextEditor.selectRange(4,25,0);
@@ -106,7 +107,7 @@
csf.downClicked();
}
});
- bot.sleep(Timing.time1S());
+ bot.sleep(Timing.time2S());
assertSourceEditorContains(jspTextEditor.getText(), insertTestString, MinMaxPanesTest.TEST_PAGE_NAME);
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2011-11-02 04:23:47 UTC (rev 36128)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2011-11-02 08:47:25 UTC (rev 36129)
@@ -46,8 +46,8 @@
+ "\t ;.df:,ee {df}df[ty]"; //$NON-NLS-1$
private final String COMPLEX_KEY_RESULT = "HELLO_Input_User_Name_Page_and" + //$NON-NLS-1$
"_some_more_text_vc_yy_ghg_l_kk_mmm_fdg_df_ee_df_df_ty"; //$NON-NLS-1$
- private final String COMPLEX_VALUE_RESULT = "!! HELLO ~ Input User, Name.Page ?" + //$NON-NLS-1$
- " and some more text @ \\# vc \\$ % yy^ &*(ghg ) _l-kk+mmm\\/fdg\\ ;.df:,ee {df}df[ty]"; //$NON-NLS-1$
+ private final String COMPLEX_VALUE_RESULT = "\\r\\n!! HELLO ~ Input User, Name.Page ? \\r\\n\\r\\n and some more text " + //$NON-NLS-1$
+ "\\r\\n \\r\\n @ \\# vc \\$ % yy^ &*(ghg ) _l-kk+mmm\\/fdg\\ \\t ;.df:,ee {df}df[ty]\\r\\n\\t\\t";; //$NON-NLS-1$
private boolean isUnusedDialogOpened = false;
@@ -536,7 +536,7 @@
JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE,
JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText);
- assertText("Plain text", defValueText); //$NON-NLS-1$
+ assertText("\\r\\n\\r\\nPlain text\\r\\n\\r\\n", defValueText); //$NON-NLS-1$
/*
* Check that checkbox for the new file is selected
*/
@@ -594,7 +594,7 @@
"hello.properties"); //$NON-NLS-1$
editor2.toTextEditor().selectLine(0);
String line = editor2.toTextEditor().getSelection();
- assertEquals("Created file is incorrect", "Plain_text=Plain text", line); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("Created file is incorrect", "Plain_text=\\r\\n\\r\\nPlain text\\r\\n\\r\\n", line); //$NON-NLS-1$ //$NON-NLS-2$
/*
* Reopen the page, and check that the new file
* for existed properties file won't be created.
@@ -630,7 +630,7 @@
JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE,
JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText);
- assertText("Plain text", defValueText); //$NON-NLS-1$
+ assertText("\\r\\n\\r\\nPlain text\\r\\n\\r\\n", defValueText); //$NON-NLS-1$
/*
* Check that checkbox for the new file is selected
*/
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r36128 - in trunk/ws/docs/restful_reference/en-US: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-11-02 00:23:47 -0400 (Wed, 02 Nov 2011)
New Revision: 36128
Added:
trunk/ws/docs/restful_reference/en-US/images/working_with_RESTful_01.png
trunk/ws/docs/restful_reference/en-US/working_with_RESTful_web_services.xml
Modified:
trunk/ws/docs/restful_reference/en-US/Book_Info.xml
trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml
Log:
updated for WS 3.3.0.M2 content
Modified: trunk/ws/docs/restful_reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/restful_reference/en-US/Book_Info.xml 2011-11-02 03:41:35 UTC (rev 36127)
+++ trunk/ws/docs/restful_reference/en-US/Book_Info.xml 2011-11-02 04:23:47 UTC (rev 36128)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
- <pubsnumber>2</pubsnumber>
+ <pubsnumber>3</pubsnumber>
<abstract>
<para>The JBoss RESTful Web Services User Guide explains how to use RESTful Web Services to implement web services in Java.</para>
</abstract>
Modified: trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml
===================================================================
--- trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml 2011-11-02 03:41:35 UTC (rev 36127)
+++ trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml 2011-11-02 04:23:47 UTC (rev 36128)
@@ -7,6 +7,8 @@
<xi:include href="overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="adding_JAX-RS_support_to_a_project.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
+<xi:include href="working_with_RESTful_web_services.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+</xi:include>
<xi:include href="sample_web_service_wizards.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="resteasy_simple_project_example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="web_service_test_view.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Added: trunk/ws/docs/restful_reference/en-US/images/working_with_RESTful_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/restful_reference/en-US/images/working_with_RESTful_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/restful_reference/en-US/working_with_RESTful_web_services.xml
===================================================================
--- trunk/ws/docs/restful_reference/en-US/working_with_RESTful_web_services.xml (rev 0)
+++ trunk/ws/docs/restful_reference/en-US/working_with_RESTful_web_services.xml 2011-11-02 04:23:47 UTC (rev 36128)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="Working_with_RESTful_web_services">
+ <title>Working with RESTful web services</title>
+ <para>
+ After JAX-RS support has been enabled, a <guilabel>RESTful Web Services</guilabel> node will appear within the project file list, in the <guilabel>Project Explorer</guilabel>. This node outlines the various RESTful services that your project contains.
+ </para>
+ <figure id="working_with_RESTful_01">
+ <title>Working with RESTful web services</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/working_with_RESTful_01.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <para>Working with RESTful web services</para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Each element in the navigator displays the resolved HTTP method (for example: GET and POST) followed by the Uniform Resource Identifier (URI) path template (for example: /customers/{id}). <property>@Path</property> annotations are available for resources and subresources, at the method level. Optional <property>@ApplicationPath</property> annotation is available only any subclass of <classname>javax.ws.rs.core.Application</classname>.
+ </para>
+ <para>
+ Under each element are the resolved, consumed and produced media types (based on the annotations you have supplied for the method or type) and the associated Java method.
+ </para>
+ <para>
+ To navigate to the related source code for a JAX-RS resource, double click the elements of the resource explorer and the related source code will be opened and highlighted. You can also copy the URI path template for later use.
+ </para>
+</chapter>
\ No newline at end of file
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r36127 - in trunk/ws/docs/restful_reference/en-US: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-11-01 23:41:35 -0400 (Tue, 01 Nov 2011)
New Revision: 36127
Added:
trunk/ws/docs/restful_reference/en-US/adding_JAX-RS_support_to_a_project.xml
trunk/ws/docs/restful_reference/en-US/images/enabling_JAX-RS_config_01.png
trunk/ws/docs/restful_reference/en-US/images/enabling_JAX-RS_config_02.png
trunk/ws/docs/restful_reference/en-US/images/enabling_JAX-RS_config_03.png
Modified:
trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml
Log:
updated for WS 3.3.0.M2 content
Modified: trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml
===================================================================
--- trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml 2011-11-02 00:40:04 UTC (rev 36126)
+++ trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml 2011-11-02 03:41:35 UTC (rev 36127)
@@ -5,6 +5,8 @@
<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<xi:include href="adding_JAX-RS_support_to_a_project.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+</xi:include>
<xi:include href="sample_web_service_wizards.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="resteasy_simple_project_example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="web_service_test_view.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Added: trunk/ws/docs/restful_reference/en-US/adding_JAX-RS_support_to_a_project.xml
===================================================================
--- trunk/ws/docs/restful_reference/en-US/adding_JAX-RS_support_to_a_project.xml (rev 0)
+++ trunk/ws/docs/restful_reference/en-US/adding_JAX-RS_support_to_a_project.xml 2011-11-02 03:41:35 UTC (rev 36127)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="Adding_JAX-RS_support">
+ <title>Adding JAX-RS support to a project</title>
+ <section id="Adding_support_to_a_new_proejct">
+ <title>Adding support to a new project</title>
+ <para>
+ When creating a new <guilabel>Dynamic Web Project</guilabel>, JAX-RS support can be enabled through the JAX-RS facet. To enable the JAX-RS facet during project creation, click the <guibutton>Modify</guibutton> button in the <guilabel>Configuration</guilabel> section.
+ </para>
+ <figure id="Enabling_JAX-RS_config_01">
+ <title>Enabling JAX-RS configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/enabling_JAX-RS_config_01.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <para>Enabling JAX-RS configuration</para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Navigate to <guilabel>Project Facets</guilabel> and click the checkbox next to the <guilabel>JAX-RS (REST Web Services)</guilabel> item. Click the <guibutton>OK</guibutton> button to save the settings and return to the <guilabel>Dynamic Web Project</guilabel> creation wizard.
+ </para>
+ <figure id="Enabling_JAX-RS_config_02">
+ <title>Enabling JAX-RS configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/enabling_JAX-RS_config_02.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <para>Enabling JAX-RS configuration</para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </section>
+ <section>
+ <title>Adding support to an existing project</title>
+ <para>
+ JAX-RS support can be added to any Java project. To add this support, right-click on a project in the <guilabel>Project Explorer</guilabel> to bring up the context menu and navigate to <menuchoice><guimenuitem>Configure</guimenuitem><guimenuitem>Add JAX-RS 1.1 support</guimenuitem></menuchoice>.
+ </para>
+ <figure id="Enabling_JAX-RS_config_03">
+ <title>Adding JAX-RS support</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/enabling_JAX-RS_config_03.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <para>Adding JAX-RS support</para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ It is also possible to add RESTful web service support to a project by bringing up the context menu and navigating to <menuchoice>
+ <guimenuitem>Properties</guimenuitem>
+ <guimenuitem>Project Facets</guimenuitem>
+ </menuchoice>. Here you can click the checkbox next to the <guilabel>JAX-RS (REST Web Services)</guilabel> item and click the <guibutton>OK</guibutton> button to save the settings, as you would when creating a new project.
+ </para>
+ </section>
+</chapter>
\ No newline at end of file
Added: trunk/ws/docs/restful_reference/en-US/images/enabling_JAX-RS_config_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/restful_reference/en-US/images/enabling_JAX-RS_config_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/restful_reference/en-US/images/enabling_JAX-RS_config_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/restful_reference/en-US/images/enabling_JAX-RS_config_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/restful_reference/en-US/images/enabling_JAX-RS_config_03.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/restful_reference/en-US/images/enabling_JAX-RS_config_03.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r36126 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext: src/org/jboss/tools/cdi/seam/text/ext/hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-11-01 20:40:04 -0400 (Tue, 01 Nov 2011)
New Revision: 36126
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SolderDefaultBeanFilterContributor.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/plugin.xml
Log:
JBIDE-10086
https://issues.jboss.org/browse/JBIDE-10086
DefaultBean filter for Assignable Beans dialog is implemented.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/plugin.xml 2011-11-02 00:39:43 UTC (rev 36125)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/plugin.xml 2011-11-02 00:40:04 UTC (rev 36126)
@@ -80,4 +80,10 @@
</extension>
+<extension
+ point="org.jboss.tools.cdi.text.ext.assignableBeanFilterContributors">
+ <contributor class="org.jboss.tools.cdi.seam.text.ext.hyperlink.SolderDefaultBeanFilterContributor"/>
+</extension>
+
+
</plugin>
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SolderDefaultBeanFilterContributor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SolderDefaultBeanFilterContributor.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SolderDefaultBeanFilterContributor.java 2011-11-02 00:40:04 UTC (rev 36126)
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.text.ext.hyperlink;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IBeanMember;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IProducer;
+import org.jboss.tools.cdi.core.extension.ICDIExtension;
+import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderDefaultBeanExtension;
+import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeanFilters;
+import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeanFilters.Filter;
+import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeanFilters.FilterContributor;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class SolderDefaultBeanFilterContributor implements FilterContributor {
+ static final int OPTION_DEFAULT_BEAN = 21;
+
+ @Override
+ public void contribute(AssignableBeanFilters filters, IInjectionPoint injectionPoint) {
+ ICDIExtension ext = injectionPoint.getCDIProject().getNature().getExtensionManager().getExtensionByRuntime("org.jboss.solder.bean.defaultbean.DefaultBeanExtension");
+ if(ext == null) {
+ return;
+ }
+ CDISeamSolderDefaultBeanExtension defaultBeanExtension = (CDISeamSolderDefaultBeanExtension)ext;
+ filters.add(0, OPTION_DEFAULT_BEAN, "Eliminated @DefaultBean", new DefaultBeanFilter(filters, injectionPoint, defaultBeanExtension));
+ }
+
+ class DefaultBeanFilter implements Filter {
+ AssignableBeanFilters filters;
+ IInjectionPoint injectionPoint;
+ CDISeamSolderDefaultBeanExtension defaultBeanExtension;
+ DefaultBeanFilter(AssignableBeanFilters filters, IInjectionPoint injectionPoint, CDISeamSolderDefaultBeanExtension defaultBeanExtension) {
+ this.filters = filters;
+ this.injectionPoint = injectionPoint;
+ this.defaultBeanExtension = defaultBeanExtension;
+ }
+
+ @Override
+ public void filter(Set<IBean> beans) {
+ Set<IBean> eligible = new HashSet<IBean>(beans);
+ for (int i = AssignableBeanFilters.OPTION_UNAVAILABLE_BEANS + 1; i < AssignableBeanFilters.OPTION_ELIMINATED_AMBIGUOUS; i++) {
+ Filter f = filters.getFilter(i);
+ if(f != null) {
+ f.filter(eligible);
+ }
+ }
+ boolean hasNonDefault = false;
+ for (IBean b: eligible) {
+ if(b.isEnabled() && !defaultBeanExtension.isBeanDefault(b)) {
+ hasNonDefault = true;
+ }
+ }
+ if(hasNonDefault) {
+ Iterator<IBean> it = beans.iterator();
+ while(it.hasNext()) {
+ IBean bean = it.next();
+ if(!eligible.contains(bean) || !defaultBeanExtension.isBeanDefault(bean)) continue;
+ it.remove();
+ }
+ }
+ }
+
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SolderDefaultBeanFilterContributor.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r36125 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: projects/CDIDependentSolderTest/src/org/jboss/defaultbean and 14 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-11-01 20:39:43 -0400 (Tue, 01 Nov 2011)
New Revision: 36125
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Test21.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.project
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Test2.class
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Town2.class
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/resources/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/resources/ResourceTest.class
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/Test22.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Q.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/R.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.modified
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.original
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java
Log:
JBIDE-9244
https://issues.jboss.org/browse/JBIDE-9244
Provided loading of validation context in dependent projects.
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Test21.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Test21.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Test21.java 2011-11-02 00:39:43 UTC (rev 36125)
@@ -0,0 +1,16 @@
+package org.jboss.defaultbean;
+
+import javax.enterprise.inject.Produces;
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+import org.jboss.defaultbean.validation2.*;
+
+public class Test21 {
+ @Produces
+ @DefaultBean(String.class)
+ @Q
+ @R
+ String getString() {
+ return "";
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Test21.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.classpath (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.classpath 2011-11-02 00:39:43 UTC (rev 36125)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/CDISolderTest/lib/cdi-api.jar"/>
+ <classpathentry kind="lib" path="/CDISolderTest/lib/javax.inject.jar"/>
+ <classpathentry kind="lib" path="/CDISolderTest/lib/solder-api.jar"/>
+ <classpathentry kind="lib" path="/CDISolderTest/lib/solder-impl.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/CDISolderTest"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.project (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.project 2011-11-02 00:39:43 UTC (rev 36125)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>CDIDependentSolderTest2</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.cdi.core.cdibuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/org.eclipse.jdt.core.prefs 2011-11-02 00:39:43 UTC (rev 36125)
@@ -0,0 +1,12 @@
+#Tue Aug 09 10:58:56 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Test2.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Test2.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Town2.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Town2.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/resources/ResourceTest.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/resources/ResourceTest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/Test22.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/Test22.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/Test22.java 2011-11-02 00:39:43 UTC (rev 36125)
@@ -0,0 +1,16 @@
+package org.jboss.defaultbean;
+import javax.enterprise.inject.Produces;
+
+import org.jboss.defaultbean.validation2.*;
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+
+public class Test22 {
+ @Produces
+ @DefaultBean(String.class)
+ @Q
+ @R
+ String getString() {
+ return "";
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/Test22.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Q.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Q.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Q.java 2011-11-02 00:39:43 UTC (rev 36125)
@@ -0,0 +1,21 @@
+package org.jboss.defaultbean.validation2;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Q {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Q.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/R.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/R.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/R.java 2011-11-02 00:39:43 UTC (rev 36125)
@@ -0,0 +1,21 @@
+package org.jboss.defaultbean.validation2;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface R {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/R.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.java 2011-11-02 00:39:43 UTC (rev 36125)
@@ -0,0 +1,16 @@
+package org.jboss.defaultbean.validation2;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+
+public class Test2 {
+ @Produces
+ @DefaultBean(String.class)
+ @Q
+ @R
+ String getString() {
+ return "";
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.modified
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.modified (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.modified 2011-11-02 00:39:43 UTC (rev 36125)
@@ -0,0 +1,15 @@
+package org.jboss.defaultbean.validation2;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+
+public class Test2 {
+ @Produces
+ @DefaultBean(String.class)
+ @R
+ String getString() {
+ return "";
+ }
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.original
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.original (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.original 2011-11-02 00:39:43 UTC (rev 36125)
@@ -0,0 +1,16 @@
+package org.jboss.defaultbean.validation2;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+
+public class Test2 {
+ @Produces
+ @DefaultBean(String.class)
+ @Q
+ @R
+ String getString() {
+ return "";
+ }
+
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java 2011-11-02 00:38:42 UTC (rev 36124)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java 2011-11-02 00:39:43 UTC (rev 36125)
@@ -61,4 +61,31 @@
AbstractResourceMarkerTest.assertMarkerIsCreated(file2, messageMask, 9);
}
+ public void testIncrementalValidationForIdenticalDefaultBeans2() throws CoreException {
+ String messageMask = SeamSolderValidationMessages.IDENTICAL_DEFAULT_BEANS.substring(0, 50) + ".*";
+
+ String path11 = "src/org/jboss/defaultbean/Test21.java";
+ String path12 = "src/org/jboss/defaultbean/Test22.java";
+ String path2 = "src/org/jboss/defaultbean/validation2/Test2.java";
+ String path2modified = "src/org/jboss/defaultbean/validation2/Test2.modified";
+ String path2original = "src/org/jboss/defaultbean/validation2/Test2.original";
+
+ IFile file11 = getDependentTestProject().getFile(path11);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file11, messageMask, 9);
+ IFile file12 = getDependentTestProject2().getFile(path12);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file12, messageMask, 9);
+ IFile file2 = getTestProject().getFile(path2);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file2, messageMask);
+
+ GenericBeanValidationTest.writeFile(getTestProject(), path2modified, path2);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file11, messageMask);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file12, messageMask);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file2, messageMask);
+
+ GenericBeanValidationTest.writeFile(getTestProject(), path2original, path2);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file11, messageMask, 9);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file12, messageMask, 9);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file2, messageMask);
+ }
+
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-11-02 00:38:42 UTC (rev 36124)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-11-02 00:39:43 UTC (rev 36125)
@@ -30,6 +30,8 @@
protected static String PROJECT_PATH = "/projects/CDISolderTest";
protected static String DEPENDENT_PROJECT_NAME = "CDIDependentSolderTest";
protected static String DEPENDENT_PROJECT_PATH = "/projects/CDIDependentSolderTest";
+ protected static String DEPENDENT_PROJECT2_NAME = "CDIDependentSolderTest2";
+ protected static String DEPENDENT_PROJECT2_PATH = "/projects/CDIDependentSolderTest2";
private ICDIProject cdiProject;
private IProject project;
@@ -37,6 +39,9 @@
private IProject dependentProject;
private ICDIProject cdiDependentProject;
+ private IProject dependentProject2;
+ private ICDIProject cdiDependentProject2;
+
public IProject getTestProject() {
if(cdiProject==null) {
project = findTestProject(PROJECT_NAME);
@@ -53,6 +58,14 @@
return dependentProject;
}
+ public IProject getDependentTestProject2() {
+ if(cdiDependentProject2 == null) {
+ dependentProject2 = findTestProject(DEPENDENT_PROJECT2_NAME);
+ cdiDependentProject2 = CDICorePlugin.getCDIProject(dependentProject2, true);
+ }
+ return dependentProject2;
+ }
+
public ICDIProject getCDIProject() {
if(cdiProject==null) {
getTestProject();
@@ -67,6 +80,13 @@
return cdiDependentProject;
}
+ public ICDIProject getDependentCDIProject2() {
+ if(cdiDependentProject2 == null) {
+ getDependentTestProject2();
+ }
+ return cdiDependentProject2;
+ }
+
public static IProject findTestProject(String name) {
return ResourcesPlugin.getWorkspace().getRoot().getProject(name);
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java 2011-11-02 00:38:42 UTC (rev 36124)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java 2011-11-02 00:39:43 UTC (rev 36125)
@@ -26,6 +26,7 @@
protected IProject project;
protected IProject dependentProject;
+ protected IProject dependentProject2;
public SeamSolderTestSetup(Test test) {
super(test);
@@ -43,6 +44,11 @@
dependentProject = ResourcesUtils.importProject(SeamSolderTest.PLUGIN_ID, SeamSolderTest.DEPENDENT_PROJECT_PATH);
TestUtil._waitForValidation(dependentProject);
}
+ dependentProject2 = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamSolderTest.DEPENDENT_PROJECT2_NAME);
+ if(dependentProject2 == null || !dependentProject2.exists()) {
+ dependentProject2 = ResourcesUtils.importProject(SeamSolderTest.PLUGIN_ID, SeamSolderTest.DEPENDENT_PROJECT2_PATH);
+ TestUtil._waitForValidation(dependentProject2);
+ }
}
@Override
@@ -50,6 +56,7 @@
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
project.delete(true, true, null);
dependentProject.delete(true, true, null);
+ dependentProject2.delete(true, true, null);
JobUtils.waitForIdle();
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
}
14 years, 1 month
- 1
- 0