JBoss Tools SVN: r32012 - workspace/rcernich/examples/esb.
by jbosstools-commits＠lists.jboss.org
Author: rcernich
Date: 2011-06-10 10:44:20 -0400 (Fri, 10 Jun 2011)
New Revision: 32012
Modified:
workspace/rcernich/examples/esb/helloworld_mail_eclipse.zip
Log:
JBIDE-8976 add mail-ra.jar to email gateway example project zip
Modified: workspace/rcernich/examples/esb/helloworld_mail_eclipse.zip
===================================================================
(Binary files differ)
14 years, 10 months
JBoss Tools SVN: r32011 - in branches/jbosstools-3.2.x/xulrunner/plugins: org.mozilla.xulrunner.gtk.linux.x86/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-06-10 10:15:45 -0400 (Fri, 10 Jun 2011)
New Revision: 32011
Modified:
branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml
branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8792 : Install flash plugin message appears in VPE if on page used flash references
- the versions of XULRunner bundles from where the nullplugins were removed (win32 and linux32 ones) are incremented to 1.9.1.2b
Modified: branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2011-06-10 13:14:50 UTC (rev 32010)
+++ branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2011-06-10 14:15:45 UTC (rev 32011)
@@ -3,7 +3,7 @@
Bundle-Name: Mozilla Xulrunner
Bundle-SymbolicName: org.mozilla.xulrunner.gtk.linux.x86;singleton:=tr
ue
-Bundle-Version: 1.9.1.2
+Bundle-Version: 1.9.1.2b
Bundle-Vendor: mozilla.org
Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86))
Modified: branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml 2011-06-10 13:14:50 UTC (rev 32010)
+++ branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml 2011-06-10 14:15:45 UTC (rev 32011)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.xulrunner.plugins</groupId>
<artifactId>org.mozilla.xulrunner.gtk.linux.x86</artifactId>
- <version>1.9.1.2</version>
+ <version>1.9.1.2b</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
Modified: branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF 2011-06-10 13:14:50 UTC (rev 32010)
+++ branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF 2011-06-10 14:15:45 UTC (rev 32011)
@@ -3,7 +3,7 @@
Bundle-Name: Mozilla Xulrunner
Bundle-SymbolicName: org.mozilla.xulrunner.win32.win32.x86;singleton:=
true
-Bundle-Version: 1.9.1.2
+Bundle-Version: 1.9.1.2b
Bundle-Vendor: mozilla.org
Eclipse-PlatformFilter: (& (osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86))
Modified: branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml 2011-06-10 13:14:50 UTC (rev 32010)
+++ branches/jbosstools-3.2.x/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml 2011-06-10 14:15:45 UTC (rev 32011)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.xulrunner.plugins</groupId>
<artifactId>org.mozilla.xulrunner.win32.win32.x86</artifactId>
- <version>1.9.1.2</version>
+ <version>1.9.1.2b</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
14 years, 10 months
JBoss Tools SVN: r32010 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-10 09:14:50 -0400 (Fri, 10 Jun 2011)
New Revision: 32010
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
Log:
[JBIDE-9054] moved declared type from ArrayList to List
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-06-10 13:08:16 UTC (rev 32009)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-06-10 13:14:50 UTC (rev 32010)
@@ -180,7 +180,7 @@
if( monitor.isCanceled())
return canceledStatus();
- ArrayList<IStatus> list = new ArrayList<IStatus>();
+ List<IStatus> list = new ArrayList<IStatus>();
boolean isBinaryObject = ServerModelUtilities.isBinaryModule(module);
boolean forceZip = forceZipModule(moduleTree);
14 years, 10 months
JBoss Tools SVN: r32009 - in trunk/as/plugins: org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-10 09:08:16 -0400 (Fri, 10 Jun 2011)
New Revision: 32009
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ServerModelUtilities.java
Log:
[JBIDE-9054] moved check for deleted module in an array of modules to utility class
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-06-10 12:23:55 UTC (rev 32008)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-06-10 13:08:16 UTC (rev 32009)
@@ -98,18 +98,12 @@
this.delta = delta;
this.publishMethod = method;
- boolean deleted = false;
- for( int i = 0; i < module.length; i++ ) {
- if( module[i].isExternal() )
- deleted = true;
- }
-
// Monitor at this point has been begun with 1000 monitor
IProgressMonitor subMon = getSubMon(monitor, 1000);
if (publishType == REMOVE_PUBLISH ) {
status = unpublish(this.server, module, subMon);
} else {
- if( deleted ) {
+ if( ServerModelUtilities.isAnyDeleted(module) ) {
publishState = IServer.PUBLISH_STATE_UNKNOWN;
} else {
if (publishType == FULL_PUBLISH ) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ServerModelUtilities.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ServerModelUtilities.java 2011-06-10 12:23:55 UTC (rev 32008)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ServerModelUtilities.java 2011-06-10 13:08:16 UTC (rev 32009)
@@ -75,4 +75,16 @@
return jbtMod.isBinary();
return false;
}
+
+ public static boolean isAnyDeleted(IModule[] module) {
+ boolean deleted = false;
+ for( int i = 0; i < module.length; i++ ) {
+ if( module[i].isExternal() ) {
+ deleted = true;
+ break;
+ }
+ }
+ return deleted;
+ }
+
}
14 years, 10 months
JBoss Tools SVN: r32008 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-10 08:23:55 -0400 (Fri, 10 Jun 2011)
New Revision: 32008
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
Log:
added copyright header and author
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-06-10 12:23:11 UTC (rev 32007)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-06-10 12:23:55 UTC (rev 32008)
@@ -8,7 +8,6 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*
- * TODO: Logging and Progress Monitors
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
14 years, 10 months
JBoss Tools SVN: r32007 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-10 08:23:11 -0400 (Fri, 10 Jun 2011)
New Revision: 32007
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
Log:
added copyright header and author
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-06-10 09:44:48 UTC (rev 32006)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-06-10 12:23:11 UTC (rev 32007)
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * 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
+ *
+ * TODO: Logging and Progress Monitors
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
import java.util.ArrayList;
@@ -10,6 +22,9 @@
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
+/**
+ * @author André Dietisheim
+ */
public class JBoss7ManagerServicePoller implements IServerStatePoller {
public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller"; //$NON-NLS-1$
@@ -70,7 +85,6 @@
} while (serverState == JBoss7ServerState.RUNNING);
return false;
} catch (JBoss7ManangerConnectException e) {
- System.err.println("connection closed!"); //$NON-NLS-1$
return true;
} catch (Exception e) {
return false;
14 years, 10 months
JBoss Tools SVN: r32006 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-06-10 05:44:48 -0400 (Fri, 10 Jun 2011)
New Revision: 32006
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Added Open On test for faces-config.xml file.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java 2011-06-10 08:34:45 UTC (rev 32005)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java 2011-06-10 09:44:48 UTC (rev 32006)
@@ -15,14 +15,19 @@
import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.helper.OpenOnHelper;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
/**
* Test open on functionality of JSF components within jsp page
* @author Vladimir Pakan
*
*/
public class OpenOnTest extends JSFAutoTestCase{
-
- public void testOpenOn() throws Throwable{
+ /**
+ * Test open on functionality of JSF components within jsp page
+ */
+ public void testOpenOn(){
eclipse.closeAllEditors();
openPage();
@@ -30,6 +35,19 @@
}
/**
+ * Test open on functionality of faces-config.xml fioe
+ * @throws Throwable
+ */
+ public void testFacesConfigOpenOn() throws Throwable{
+
+ eclipse.closeAllEditors();
+ SWTBotEditor facesConfigEditor = eclipse.openFile(VPEAutoTestCase.JBT_TEST_PROJECT_NAME, "WebContent","WEB-INF","faces-config.xml");
+ new SWTBotEditorExt(facesConfigEditor.toTextEditor().getReference(),bot)
+ .selectPage(IDELabel.FacesConfigEditor.SOURCE_TAB_LABEL);
+ checkFacesConfigOpenOn();
+
+ }
+ /**
* Check Open On functionality for jsp page
*/
private void checkOpenOn() {
@@ -58,22 +76,75 @@
openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
SWTTestExt.bot, TEST_PAGE, "value=\"#{user.name}\"", 10,
0, 0, expectedOpenedFileName);
- String selectedTextInSourceEditor = openedEditor.toTextEditor().getSelection();
- String expectedSelectedTextInSourceEditor = "User";
- assertTrue("Selected text in Source editor has to be " + expectedSelectedTextInSourceEditor +
- " but is " + selectedTextInSourceEditor,
- selectedTextInSourceEditor.equalsIgnoreCase(expectedSelectedTextInSourceEditor));
+ String selectedTextInEditor = openedEditor.toTextEditor().getSelection();
+ String expectedSelectedTextInEditor = "User";
+ assertTrue("Selected text in editor has to be " + expectedSelectedTextInEditor +
+ " but is " + selectedTextInEditor,
+ selectedTextInEditor.equalsIgnoreCase(expectedSelectedTextInEditor));
openedEditor.close();
// Check open on for "#{user.name} EL when text 'name' is selected
expectedOpenedFileName = "User.java";
openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
SWTTestExt.bot, TEST_PAGE, "value=\"#{user.name}\"", 15,
0, 0, expectedOpenedFileName);
+ selectedTextInEditor = openedEditor.toTextEditor().getSelection();
+ expectedSelectedTextInEditor = "getName";
+ assertTrue("Selected text in editor has to be " + expectedSelectedTextInEditor +
+ " but is " + selectedTextInEditor,
+ selectedTextInEditor.equalsIgnoreCase(expectedSelectedTextInEditor));
+ openedEditor.close();
+ }
+ /**
+ * Check Open On functionality for faces-config.xml file
+ */
+ private void checkFacesConfigOpenOn() {
+ // Check open on for demo.User managed bean
+ final String facesConfigTitle = "faces-config.xml";
+ String expectedOpenedFileName = "User.java";
+ SWTBotEditor openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
+ SWTTestExt.bot, facesConfigTitle, "<managed-bean-class>demo.User</managed-bean-class>", 22,
+ 0, 0, expectedOpenedFileName);
+ String selectedTextInSourceEditor = openedEditor.toTextEditor().getSelection();
+ String expectedSelectedTextInEditor = "User";
+ assertTrue("Selected text in editor has to be " + expectedSelectedTextInEditor +
+ " but is " + selectedTextInSourceEditor,
+ selectedTextInSourceEditor.equalsIgnoreCase(expectedSelectedTextInEditor));
+ openedEditor.close();
+ // Check open on for name property of demo.User managed bean
+ expectedOpenedFileName = "User.java";
+ openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
+ SWTTestExt.bot, facesConfigTitle, "<property-name>name</property-name>", 17,
+ 0, 0, expectedOpenedFileName);
selectedTextInSourceEditor = openedEditor.toTextEditor().getSelection();
- expectedSelectedTextInSourceEditor = "getName";
- assertTrue("Selected text in Source editor has to be " + expectedSelectedTextInSourceEditor +
+ expectedSelectedTextInEditor = "getName";
+ assertTrue("Selected text in editor has to be " + expectedSelectedTextInEditor +
" but is " + selectedTextInSourceEditor,
- selectedTextInSourceEditor.equalsIgnoreCase(expectedSelectedTextInSourceEditor));
+ selectedTextInSourceEditor.equalsIgnoreCase(expectedSelectedTextInEditor));
openedEditor.close();
+ // Check open on for java.lang.String class
+ expectedOpenedFileName = "String.class";
+ openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
+ SWTTestExt.bot, facesConfigTitle, "<property-class>java.lang.String</property-class>", 18,
+ 0, 0, expectedOpenedFileName);
+ selectedTextInSourceEditor = openedEditor.toTextEditor().getSelection();
+ expectedSelectedTextInEditor = "String";
+ assertTrue("Selected text in editor has to be " + expectedSelectedTextInEditor +
+ " but is " + selectedTextInSourceEditor,
+ selectedTextInSourceEditor.equalsIgnoreCase(expectedSelectedTextInEditor));
+ openedEditor.close();
+ // Check open on for URI /pages/inputUserName.jsp within <from-view-id> tag
+ expectedOpenedFileName = "inputUserName.jsp";
+ openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
+ SWTTestExt.bot, facesConfigTitle, "<from-view-id>/pages/inputUserName.jsp</from-view-id>", 16,
+ 0, 0, expectedOpenedFileName);
+ openedEditor.close();
+ // Check open on for URI /pages/hello.jsp within <to-view-id> tag
+ expectedOpenedFileName = "hello.jsp";
+ openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
+ SWTTestExt.bot, facesConfigTitle, "<to-view-id>/pages/hello.jsp</to-view-id>", 14,
+ 0, 0, expectedOpenedFileName);
+ openedEditor.close();
+
}
+
}
\ No newline at end of file
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-06-10 08:34:45 UTC (rev 32005)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-06-10 09:44:48 UTC (rev 32006)
@@ -668,4 +668,11 @@
public static final String REPOSITORY = "Repository: ";
}
+ public static class FacesConfigEditor{
+
+ public static final String SOURCE_TAB_LABEL = "Source";
+ public static final String TREE_TAB_LABEL = "Tree";
+ public static final String DIAGRAM_TAB_LABEL = "Diagram";
+
+ }
}
14 years, 10 months
JBoss Tools SVN: r32005 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-10 04:34:45 -0400 (Fri, 10 Jun 2011)
New Revision: 32005
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
Log:
JBIDE-8718 - limiting to all jars in the javax folder
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-06-10 08:27:04 UTC (rev 32004)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-06-10 08:34:45 UTC (rev 32005)
@@ -30,6 +30,7 @@
public static final String AS7_STANDALONE = "standalone";//$NON-NLS-1$
public static final String AS7_DEPLOYMENTS = "deployments";//$NON-NLS-1$
public static final String AS7_MODULES = "modules";//$NON-NLS-1$
+ public static final String JAVAX = "javax";//$NON-NLS-1$
public static final String[] JBOSS_TEMPORARY_FOLDERS = new String[] { WORK, DATA, FOLDER_TMP, FOLDER_LOG};
14 years, 10 months
JBoss Tools SVN: r32004 - trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-10 04:27:04 -0400 (Fri, 10 Jun 2011)
New Revision: 32004
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
Log:
JBIDE-8718 - limiting to all jars in the javax folder
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2011-06-10 08:25:29 UTC (rev 32003)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2011-06-10 08:27:04 UTC (rev 32004)
@@ -211,7 +211,7 @@
protected Set<Entry> get70(IPath location) {
Set<Entry> list = new HashSet<Entry>();
- addPaths(location.append(AS7_MODULES), list, true);
+ addPaths(location.append(AS7_MODULES).append(JAVAX), list, true);
return list;
}
14 years, 10 months
JBoss Tools SVN: r32003 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-06-10 04:25:29 -0400 (Fri, 10 Jun 2011)
New Revision: 32003
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/OpenOnTest.java
Log:
Refactoring Open Ons testing functionality
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java 2011-06-10 07:55:13 UTC (rev 32002)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java 2011-06-10 08:25:29 UTC (rev 32003)
@@ -10,33 +10,21 @@
******************************************************************************/
package org.jboss.tools.jsf.ui.bot.test.smoke;
-import org.apache.log4j.Logger;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
-import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.helper.OpenOnHelper;
-import org.jboss.tools.ui.bot.ext.types.IDELabel;
-import org.jboss.tools.ui.bot.test.JBTSWTBotTestCase;
/**
* Test open on functionality of JSF components within jsp page
* @author Vladimir Pakan
*
*/
public class OpenOnTest extends JSFAutoTestCase{
- private static Logger log = Logger.getLogger(JBTSWTBotTestCase.class);
+
public void testOpenOn() throws Throwable{
- try{
- bot.menu(IDELabel.Menu.FILE).menu(IDELabel.Menu.CLOSE_ALL).click();
- log.info("All Editors closed");
- } catch (WidgetNotFoundException wnfe){
- log.info("No Editors to close");
- } catch (TimeoutException te){
- log.info("No Editors to close");
- }
-
+
+ eclipse.closeAllEditors();
openPage();
checkOpenOn();
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2011-06-10 07:55:13 UTC (rev 32002)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2011-06-10 08:25:29 UTC (rev 32003)
@@ -12,14 +12,12 @@
package org.jboss.tools.ui.bot.ext;
import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withMnemonic;
import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -34,7 +32,6 @@
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
@@ -46,6 +43,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
import org.hamcrest.Matcher;
import org.jboss.tools.ui.bot.ext.condition.ButtonIsDisabled;
import org.jboss.tools.ui.bot.ext.entity.JavaClassEntity;
@@ -54,8 +52,6 @@
import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.ServerServer;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Preference;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem.View;
-import org.jboss.tools.ui.bot.ext.gen.INewObject;
import org.jboss.tools.ui.bot.ext.gen.IServer;
import org.jboss.tools.ui.bot.ext.gen.IServerRuntime;
import org.jboss.tools.ui.bot.ext.types.EntityType;
@@ -63,7 +59,6 @@
import org.jboss.tools.ui.bot.ext.types.IDELabel.PreferencesDialog;
import org.jboss.tools.ui.bot.ext.types.PerspectiveType;
import org.jboss.tools.ui.bot.ext.types.ViewType;
-import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
import org.jboss.tools.ui.bot.ext.view.RemoteSystems;
/**
@@ -1439,4 +1434,17 @@
return null;
}
}
+ /**
+ * Closes all opened Editors
+ */
+ public void closeAllEditors(){
+ try{
+ bot.menu(IDELabel.Menu.FILE).menu(IDELabel.Menu.CLOSE_ALL).click();
+ log.info("All Editors closed");
+ } catch (WidgetNotFoundException wnfe){
+ log.info("No Editors to close");
+ } catch (TimeoutException te){
+ log.info("No Editors to close");
+ }
+ }
}
\ No newline at end of file
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2011-06-10 07:55:13 UTC (rev 32002)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2011-06-10 08:25:29 UTC (rev 32003)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+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.finders.UIThreadRunnable;
@@ -520,4 +521,78 @@
log.info("Report usage window didn't appear");
}
}
+
+ /**
+ * Selects textToSelect within Source Pane of editor with title editorTitle
+ * @param bot
+ * @param editorTitle
+ * @param textToSelect
+ * @param selectionOffset
+ * @param selectionLength
+ * @param textToSelectIndex
+ * @return SWTBotEclipseEditor
+ */
+ public static SWTBotEclipseEditor selectTextInSourcePane(SWTBotExt bot,
+ String editorTitle, String textToSelect ,
+ int selectionOffset , int selectionLength , int textToSelectIndex) {
+
+ SWTBotEclipseEditor editor = bot.editorByTitle(editorTitle).toTextEditor();
+ String editorText = editor.getText();
+ boolean found = false;
+ int iStartIndex = 0;
+ int iRow = 0;
+ if (editorText != null && editorText.length() > 0 && editorText.contains(textToSelect)){
+ String[] editorLines = editorText.split("\n");
+ int iOccurenceIndex = 0;
+ while (!found && iRow < editorLines.length){
+ String lineText = editorLines[iRow];
+ iStartIndex = 0;
+ while (!found && lineText.contains(textToSelect)){
+ if (iOccurenceIndex == textToSelectIndex){
+ found = true;
+ iStartIndex += lineText.indexOf(textToSelect);
+ }
+ else{
+ iOccurenceIndex++;
+ int iNewStartIndex = lineText.indexOf(textToSelect) + textToSelect.length();
+ iStartIndex += iNewStartIndex;
+ lineText = lineText.substring(iNewStartIndex);
+ }
+ }
+ if (!found){
+ iRow++;
+ }
+ }
+
+ }
+
+ if (found) {
+ editor.selectRange(iRow, iStartIndex + selectionOffset, selectionLength);
+ }
+ else{
+ throw new SelectTextInSourcePaneException ("Wrong parameters specified for method selectTextInSourcePane.\n" +
+ "Unable to select required text '" + textToSelect +
+ "' within editor with title " + editorTitle + ".\n" +
+ "Editor text is: " + editorText);
+ }
+
+ return editor;
+
+ }
+
+ /**
+ * Selects textToSelect within Source Pane of editor with title editorTitle
+ * @param bot
+ * @param editorTitle
+ * @param textToSelect
+ * @param selectionOffset
+ * @param selectionLength
+ * @return SWTBotEclipseEditor
+ */
+ public static SWTBotEclipseEditor selectTextInSourcePane(SWTBotExt bot,
+ String editorTitle, String textToSelect ,
+ int selectionOffset , int selectionLength) {
+ return SWTJBTExt.selectTextInSourcePane(bot, editorTitle, textToSelect,
+ selectionOffset, selectionLength, 0);
+ }
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2011-06-10 07:55:13 UTC (rev 32002)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2011-06-10 08:25:29 UTC (rev 32003)
@@ -32,7 +32,6 @@
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.Widget;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.SWTBot;
@@ -800,77 +799,5 @@
File.separator +
projectName;
}
- /**
- * Selects textToSelect within Source Pane of editor with title editorTitle
- * @param bot
- * @param editorTitle
- * @param textToSelect
- * @param selectionOffset
- * @param selectionLength
- * @return SWTBotEclipseEditor
- */
- public static SWTBotEclipseEditor selectTextInSourcePane(SWTBotExt bot,
- String editorTitle, String textToSelect ,
- int selectionOffset , int selectionLength) {
- return selectTextInSourcePane(bot, editorTitle, textToSelect,
- selectionOffset, selectionLength, 0);
- }
- /**
- * Selects textToSelect within Source Pane of editor with title editorTitle
- * @param bot
- * @param editorTitle
- * @param textToSelect
- * @param selectionOffset
- * @param selectionLength
- * @param textToSelectIndex
- * @return SWTBotEclipseEditor
- */
- public static SWTBotEclipseEditor selectTextInSourcePane(SWTBotExt bot,
- String editorTitle, String textToSelect ,
- int selectionOffset , int selectionLength , int textToSelectIndex) {
-
- SWTBotEclipseEditor editor = bot.editorByTitle(editorTitle).toTextEditor();
- String editorText = editor.getText();
- boolean found = false;
- int iStartIndex = 0;
- int iRow = 0;
- if (editorText != null && editorText.length() > 0 && editorText.contains(textToSelect)){
- String[] editorLines = editorText.split("\n");
- int iOccurenceIndex = 0;
- while (!found && iRow < editorLines.length){
- String lineText = editorLines[iRow];
- iStartIndex = 0;
- while (!found && lineText.contains(textToSelect)){
- if (iOccurenceIndex == textToSelectIndex){
- found = true;
- iStartIndex += lineText.indexOf(textToSelect);
- }
- else{
- iOccurenceIndex++;
- int iNewStartIndex = lineText.indexOf(textToSelect) + textToSelect.length();
- iStartIndex += iNewStartIndex;
- lineText = lineText.substring(iNewStartIndex);
- }
- }
- if (!found){
- iRow++;
- }
- }
-
- }
-
- if (found) {
- editor.selectRange(iRow, iStartIndex + selectionOffset, selectionLength);
- }
- else{
- throw new SelectTextInSourcePaneException ("Wrong parameters specified for method selectTextInSourcePane.\n" +
- "Unable to select required text '" + textToSelect +
- "' within editor with title " + editorTitle + ".\n" +
- "Editor text is: " + editorText);
- }
-
- return editor;
-
- }
}
\ No newline at end of file
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2011-06-10 07:55:13 UTC (rev 32002)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2011-06-10 08:25:29 UTC (rev 32003)
@@ -19,7 +19,7 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
-import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.Timing;
/**
@@ -46,7 +46,7 @@
SWTBotEditor openedEditor = null;
- SWTBotEclipseEditor sourceEditor = SWTUtilExt.selectTextInSourcePane(bot, editorTitle, textToSelect,
+ SWTBotEclipseEditor sourceEditor = SWTJBTExt.selectTextInSourcePane(bot, editorTitle, textToSelect,
selectionOffset, selectionLength, textToSelectIndex);
bot.sleep(Timing.time1S());
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/OpenOnTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/OpenOnTest.java 2011-06-10 07:55:13 UTC (rev 32002)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/OpenOnTest.java 2011-06-10 08:25:29 UTC (rev 32003)
@@ -10,14 +10,9 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.bot.test.smoke;
-import org.apache.log4j.Logger;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.helper.OpenOnHelper;
-import org.jboss.tools.ui.bot.ext.types.IDELabel;
-import org.jboss.tools.ui.bot.test.JBTSWTBotTestCase;
import org.jboss.tools.vpe.ui.bot.test.editor.VPEEditorTestCase;
/**
* Test open on functionality
@@ -25,18 +20,9 @@
*
*/
public class OpenOnTest extends VPEEditorTestCase{
- private static Logger log = Logger.getLogger(JBTSWTBotTestCase.class);
public void testOpenOn() throws Throwable{
- try{
- bot.menu(IDELabel.Menu.FILE).menu(IDELabel.Menu.CLOSE_ALL).click();
- log.info("All Editors closed");
- } catch (WidgetNotFoundException wnfe){
- log.info("No Editors to close");
- } catch (TimeoutException te){
- log.info("No Editors to close");
- }
-
-
+
+ eclipse.closeAllEditors();
openPage();
checkOpenOn();
14 years, 10 months