JBoss Tools SVN: r32091 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-14 12:16:37 -0400 (Tue, 14 Jun 2011)
New Revision: 32091
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
Log:
JBIDE-9133
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-06-14 16:01:34 UTC (rev 32090)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-06-14 16:16:37 UTC (rev 32091)
@@ -27,9 +27,7 @@
}
public void serverAdded(IServer server) {
- // TODO clean up this interface call
- if( !ServerUtil.isJBoss7(server))
- ServerUtil.createStandardFolders(server);
+ ServerUtil.createStandardFolders(server);
}
public void serverRemoved(IServer server) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-14 16:01:34 UTC (rev 32090)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-14 16:16:37 UTC (rev 32091)
@@ -107,6 +107,7 @@
// create metadata area
File location = JBossServerCorePlugin.getServerStateLocation(server).toFile();
location.mkdirs();
+ JBossServerCorePlugin.getServerStateLocation(server).append(IJBossToolingConstants.TEMP_DEPLOY).toFile().mkdirs();
// create temp deploy folder
JBossServer ds = ( JBossServer)server.loadAdapter(JBossServer.class, null);
14 years, 10 months
JBoss Tools SVN: r32090 - trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-14 12:01:34 -0400 (Tue, 14 Jun 2011)
New Revision: 32090
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml
Log:
JBIDE-8948 - as7 management not in build, STILL
Modified: trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 2011-06-14 14:17:19 UTC (rev 32089)
+++ trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 2011-06-14 16:01:34 UTC (rev 32090)
@@ -93,6 +93,13 @@
unpack="false"/>
<plugin
+ id="org.jboss.ide.eclipse.as.management.as7"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.jboss.ide.eclipse.as.ui"
download-size="0"
install-size="0"
14 years, 10 months
JBoss Tools SVN: r32089 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-06-14 10:17:19 -0400 (Tue, 14 Jun 2011)
New Revision: 32089
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
Log:
Fix misspelled test method names.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-06-14 13:38:02 UTC (rev 32088)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-06-14 14:17:19 UTC (rev 32089)
@@ -55,7 +55,7 @@
/**
* Test Code Completion functionality for resource
*/
- public void xxtestCodeCompletionOfResource(){
+ public void testCodeCompletionOfResource(){
ContentAssistBot contentAssist = editor.contentAssist();
String textForSelection = "${msg.prompt}";
@@ -81,7 +81,7 @@
/**
* Test Code Completion functionality of <input> tag attributes within xhtml page
*/
- public void xtestCodeCompletionOfInputTagAttributes(){
+ public void testCodeCompletionOfInputTagAttributes(){
ContentAssistBot contentAssist = editor.contentAssist();
String textForSelection = "action=\"greeting\" value=\"Say Hello\" ";
@@ -105,7 +105,7 @@
/**
* Test Code Completion functionality of <input> tag for jsfc attribute within xhtml page
*/
- public void xtestCodeCompletionOfInputTagForJsfcAttribute(){
+ public void testCodeCompletionOfInputTagForJsfcAttribute(){
// check jsfc attribute insertion via Content Assist
SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot,
FACELETS_TEST_PAGE,
14 years, 10 months
JBoss Tools SVN: r32088 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-06-14 09:38:02 -0400 (Tue, 14 Jun 2011)
New Revision: 32088
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
Log:
Added test for Content Assist functionality
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-06-14 10:57:18 UTC (rev 32087)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-06-14 13:38:02 UTC (rev 32088)
@@ -13,6 +13,7 @@
import org.jboss.tools.jsf.ui.bot.test.jsf2.refactor.JSF2MoveParticipantTest;
import org.jboss.tools.jsf.ui.bot.test.jsf2.refactor.JSF2RenameParticipantTest;
import org.jboss.tools.jsf.ui.bot.test.smoke.AddRemoveJSFCapabilitiesTest;
+import org.jboss.tools.jsf.ui.bot.test.smoke.CodeCompletionTest;
import org.jboss.tools.jsf.ui.bot.test.smoke.CreateNewJSFProjectTest;
import org.jboss.tools.jsf.ui.bot.test.smoke.OpenOnTest;
import org.jboss.tools.jsf.ui.bot.test.templates.SetTemplateForUnknownTagTest;
@@ -40,6 +41,7 @@
suite.addTestSuite(JSF2RenameParticipantTest.class);
suite.addTestSuite(JSF2AttributeRenameTest.class);
suite.addTestSuite(OpenOnTest.class);
+ suite.addTestSuite(CodeCompletionTest.class);
return suite;
}
}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-06-14 13:38:02 UTC (rev 32088)
@@ -0,0 +1,358 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.ui.bot.test.smoke;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.helper.ContentAssistHelper;
+import org.jboss.tools.ui.bot.ext.parts.ContentAssistBot;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
+/** * Test Code Completion functionality of JSF components within xhtml page
+ * @author Vladimir Pakan
+ *
+ */
+public class CodeCompletionTest extends JSFAutoTestCase{
+ private SWTBotEditorExt editor;
+ private String originalEditorText;
+ /**
+ * Test Code Completion functionality for managed bean
+ */
+ public void testCodeCompletionOfManagedBean(){
+
+ String textForSelection = "value=\"#{person.name}\"";
+ List<String> expectedProposals = new LinkedList<String>();
+ expectedProposals.add("msg");
+ expectedProposals.add("person : Person");
+ // Check content assist for #{ prefix
+ ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ textForSelection,
+ 9,
+ 0,
+ expectedProposals);
+ // Check content assist for ${msg. prefix
+ expectedProposals.clear();
+ expectedProposals.add("name : String - Person");
+ ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ textForSelection,
+ 16,
+ 0,
+ expectedProposals);
+ }
+ /**
+ * Test Code Completion functionality for resource
+ */
+ public void xxtestCodeCompletionOfResource(){
+
+ ContentAssistBot contentAssist = editor.contentAssist();
+ String textForSelection = "${msg.prompt}";
+ // Check content assist for ${ prefix
+ SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ textForSelection,
+ 2,
+ 0,
+ 0);
+ contentAssist.checkContentAssist("msg", false);
+ contentAssist.checkContentAssist("person : Person", false);
+ // Check content assist for ${msg. prefix
+ SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ textForSelection,
+ 6,
+ 0,
+ 0);
+ contentAssist.checkContentAssist("greeting", false);
+ contentAssist.checkContentAssist("prompt", false);
+ }
+ /**
+ * Test Code Completion functionality of <input> tag attributes within xhtml page
+ */
+ public void xtestCodeCompletionOfInputTagAttributes(){
+
+ ContentAssistBot contentAssist = editor.contentAssist();
+ String textForSelection = "action=\"greeting\" value=\"Say Hello\" ";
+ // Check content assist menu content
+ ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ textForSelection,
+ 36,
+ 0,
+ getInputTagProposalList());
+ // Check content assist insertion
+ String contentAssistToUse = "maxlength";
+ contentAssist.checkContentAssist(contentAssistToUse, true);
+ editor.save();
+ String expectedInsertedText = textForSelection + contentAssistToUse + "=\"\"";
+ assertTrue("Editor has to contain text '" + expectedInsertedText + "' but it doesn't\n" +
+ "Editor Text is\n" + editor.getText(),
+ editor.getText().contains(expectedInsertedText));
+
+ }
+ /**
+ * Test Code Completion functionality of <input> tag for jsfc attribute within xhtml page
+ */
+ public void xtestCodeCompletionOfInputTagForJsfcAttribute(){
+ // check jsfc attribute insertion via Content Assist
+ SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ "<input ",
+ 0,
+ 0,
+ 0);
+ String textToInsert = "<input />";
+ editor.insertText(textToInsert);
+ SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ textToInsert,
+ 7,
+ 0,
+ 0);
+ String contentAssistToUse = "jsfc";
+ ContentAssistBot contentAssist = editor.contentAssist();
+ contentAssist.checkContentAssist(contentAssistToUse, true);
+ editor.save();
+ String expectedInsertedText = "<input " + contentAssistToUse + "=\"\"";
+ assertTrue("Editor has to contain text '" + expectedInsertedText + "' but it doesn't\n" +
+ "Editor Text is\n" + editor.getText(),
+ editor.getText().contains(expectedInsertedText));
+ // check jsfc attribute value Content Assist menu Content
+ ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ expectedInsertedText,
+ 13,
+ 0,
+ getJsfcAttributeValueProposalList());
+ // check jsfc attribute value insertion via Content Assist
+ contentAssistToUse = "h:inputText";
+ contentAssist.checkContentAssist(contentAssistToUse, true);
+ expectedInsertedText = "<input jsfc=\"" + contentAssistToUse + "\"";
+ assertTrue("Editor has to contain text '" + expectedInsertedText + "' but it doesn't\n" +
+ "Editor Text is\n" + editor.getText(),
+ editor.getText().contains(expectedInsertedText));
+ editor.save();
+ // check Content Assist insertion of jsfc attribute attribute
+ ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ expectedInsertedText,
+ 26,
+ 0,
+ getJsfcAttributeValueAttributesProposalList());
+ // check jsfc attribute value attribute insertion via Content Assist
+ String contentAssistAttributeToUse = "accept";
+ contentAssist.checkContentAssist(contentAssistAttributeToUse, true);
+ expectedInsertedText = "<input jsfc=\"" + contentAssistToUse + "\" " + contentAssistAttributeToUse + "=\"\"";
+ assertTrue("Editor has to contain text '" + expectedInsertedText + "' but it doesn't\n" +
+ "Editor Text is\n" + editor.getText(),
+ editor.getText().contains(expectedInsertedText));
+ editor.save();
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ openPage(FACELETS_TEST_PAGE,FACELETS_TEST_PROJECT_NAME);
+ editor = SWTTestExt.bot.swtBotEditorExtByTitle(FACELETS_TEST_PAGE);
+ originalEditorText = editor.getText();
+ }
+ /**
+ * Returns list of expected Content Assist proposals for Input tag
+ * @return
+ */
+ private static List<String> getInputTagProposalList(){
+ LinkedList<String> result = new LinkedList<String>();
+
+ result.add("accept");
+ result.add("accesskey");
+ result.add("align=\"top\"");
+ result.add("alt");
+ result.add("checked=\"checked\"");
+ result.add("class");
+ result.add("dir=\"ltr\"");
+ result.add("disabled=\"disabled\"");
+ result.add("lang");
+ result.add("maxlength");
+ result.add("name");
+ result.add("onblur");
+ result.add("onchange");
+ result.add("onclick");
+ result.add("ondblclick");
+ result.add("onfocus");
+ result.add("onkeydown");
+ result.add("onkeypress");
+ result.add("onkeyup");
+ result.add("onmousedown");
+ result.add("onmousemove");
+ result.add("onmouseout");
+ result.add("onmouseover");
+ result.add("onmouseup");
+ result.add("onselect");
+ result.add("readonly=\"readonly\"");
+ result.add("size");
+ result.add("src");
+ result.add("style");
+ result.add("tabindex");
+ result.add("title");
+ result.add("usemap");
+ result.add("xml:lang");
+ result.add("actionListener");
+ result.add("binding");
+ result.add("image");
+ result.add("immediate");
+ result.add("label");
+ result.add("rendered");
+ result.add("styleClass");
+
+ return result;
+ }
+ /**
+ * Returns list of expected Content Assist proposals for Jsfc attribute value
+ * @return
+ */
+ private static List<String> getJsfcAttributeValueProposalList(){
+ LinkedList<String> result = new LinkedList<String>();
+
+ result.add("c:catch");
+ result.add("c:choose");
+ result.add("c:forEach");
+ result.add("c:forTokens");
+ result.add("c:if");
+ result.add("c:import");
+ result.add("c:otherwise");
+ result.add("c:out");
+ result.add("c:param");
+ result.add("c:redirect");
+ result.add("c:remove");
+ result.add("c:set");
+ result.add("c:url");
+ result.add("c:when");
+ result.add("f:actionListener");
+ result.add("f:attribute");
+ result.add("f:convertDateTime");
+ result.add("f:convertNumber");
+ result.add("f:converter");
+ result.add("f:facet");
+ result.add("f:loadBundle");
+ result.add("f:param");
+ result.add("f:phaseListener");
+ result.add("f:selectItem");
+ result.add("f:selectItems");
+ result.add("f:setPropertyActionListener");
+ result.add("f:subview");
+ result.add("f:validateDoubleRange");
+ result.add("f:validateLength");
+ result.add("f:validateLongRange");
+ result.add("f:validator");
+ result.add("f:valueChangeListener");
+ result.add("f:verbatim");
+ result.add("f:view");
+ result.add("h:column");
+ result.add("h:commandButton");
+ result.add("h:commandLink");
+ result.add("h:dataTable");
+ result.add("h:form");
+ result.add("h:graphicImage");
+ result.add("h:inputHidden");
+ result.add("h:inputSecret");
+ result.add("h:inputText");
+ result.add("h:inputTextarea");
+ result.add("h:message");
+ result.add("h:messages");
+ result.add("h:outputFormat");
+ result.add("h:outputLabel");
+ result.add("h:outputLink");
+ result.add("h:outputText");
+ result.add("h:panelGrid");
+ result.add("h:panelGroup");
+ result.add("h:selectBooleanCheckbox");
+ result.add("h:selectManyCheckbox");
+ result.add("h:selectManyListbox");
+ result.add("h:selectManyMenu");
+ result.add("h:selectOneListbox");
+ result.add("h:selectOneMenu");
+ result.add("h:selectOneRadio");
+ result.add("msg");
+ result.add("person : Person");
+ return result;
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ if (editor != null){
+ editor.setText(originalEditorText);
+ editor.saveAndClose();
+ }
+ super.tearDown();
+ }
+ /**
+ * Returns list of expected Content Assist proposals for Jsfc attribute value attributes
+ * @return
+ */
+ private static List<String> getJsfcAttributeValueAttributesProposalList(){
+ LinkedList<String> result = new LinkedList<String>();
+
+ result.add("accept");
+ result.add("accesskey");
+ result.add("align=\"top\"");
+ result.add("alt");
+ result.add("checked=\"checked\"");
+ result.add("class");
+ result.add("dir=\"ltr\"");
+ result.add("disabled=\"disabled\"");
+ result.add("id");
+ result.add("lang");
+ result.add("maxlength");
+ result.add("name");
+ result.add("onblur");
+ result.add("onchange");
+ result.add("onclick");
+ result.add("ondblclick");
+ result.add("onfocus");
+ result.add("onkeydown");
+ result.add("onkeypress");
+ result.add("onkeyup");
+ result.add("onmousedown");
+ result.add("onmousemove");
+ result.add("onmouseout");
+ result.add("onmouseover");
+ result.add("onmouseup");
+ result.add("onselect");
+ result.add("readonly=\"readonly\"");
+ result.add("size");
+ result.add("src");
+ result.add("style");
+ result.add("tabindex");
+ result.add("title");
+ result.add("type=\"text\"");
+ result.add("usemap");
+ result.add("value");
+ result.add("xml:lang");
+ result.add("autocomplete");
+ result.add("binding");
+ result.add("converter");
+ result.add("converterMessage");
+ result.add("immediate");
+ result.add("label");
+ result.add("rendered");
+ result.add("required");
+ result.add("requiredMessage");
+ result.add("styleClass");
+ result.add("validator");
+ result.add("validatorMessage");
+ result.add("valueChangeListener");
+ return result;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java 2011-06-14 13:38:02 UTC (rev 32088)
@@ -0,0 +1,130 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.ui.bot.ext.helper;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Iterator;
+import java.util.List;
+import org.apache.log4j.Logger;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.parts.ContentAssistBot;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
+
+/**
+ * Helper for Content Assist functionality testing
+ * @author Vladimir Pakan
+ *
+ */
+public class ContentAssistHelper {
+ protected static final Logger log = Logger.getLogger(ContentAssistHelper.class);
+ /**
+ * Checks Content Assist content on specified position within editor with editorTitle
+ * and checks if expectedProposalList is equal to current Proposal List
+ * @param editorTitle
+ * @param textToSelect
+ * @param selectionOffset
+ * @param selectionLength
+ * @param textToSelectIndex
+ * @param expectedProposalList
+ */
+ public static SWTBotEditor checkContentAssistContent(SWTBotExt bot,
+ String editorTitle, String textToSelect, int selectionOffset,
+ int selectionLength, int textToSelectIndex, List<String> expectedProposalList) {
+
+ SWTJBTExt.selectTextInSourcePane(bot,
+ editorTitle, textToSelect, selectionOffset, selectionLength,
+ textToSelectIndex);
+
+ bot.sleep(Timing.time1S());
+
+ SWTBotEditorExt editor = SWTTestExt.bot.swtBotEditorExtByTitle(editorTitle);
+ ContentAssistBot contentAssist = editor.contentAssist();
+ List<String> currentProposalList = contentAssist.getProposalList();
+ assertTrue("Code Assist menu has incorrect menu items.\n" +
+ "Expected Proposal Menu Labels vs. Current Proposal Menu Labels :\n" +
+ ContentAssistHelper.getListsDiffFormatted(expectedProposalList,currentProposalList),
+ expectedProposalList.equals(currentProposalList));
+
+ return editor;
+
+ }
+
+ /**
+ * Checks Content Assist content on specified position within editor with editorTitle
+ * and checks if expectedProposalList is equal to current Proposal List
+ * @param editorTitle
+ * @param textToSelect
+ * @param selectionOffset
+ * @param selectionLength
+ * @param textToSelectIndex
+ * @param expectedProposalList
+ */
+ public static SWTBotEditor checkContentAssistContent(SWTBotExt bot,
+ String editorTitle, String textToSelect, int selectionOffset,
+ int selectionLength, List<String> expectedProposalList) {
+
+ return ContentAssistHelper.checkContentAssistContent(bot,
+ editorTitle,
+ textToSelect,
+ selectionOffset,
+ selectionLength,
+ 0,
+ expectedProposalList);
+
+ }
+ /**
+ * Get formatted difference between list0 and list1
+ * @param list0
+ * @param list1
+ * @return
+ */
+ private static String getListsDiffFormatted (List<String> list0 , List<String> list1){
+ StringBuffer sb = new StringBuffer("");
+ if (list0 == null && list1 == null){
+ sb.append("<null> == <null>");
+ }else if (list0 == null){
+ sb.append("<null> != <not null>");
+ }else if (list1 == null){
+ sb.append("<null> != <not null>");
+ } else{
+ Iterator<String> iterator0 = list0.iterator();
+ Iterator<String> iterator1 = list1.iterator();
+ boolean continueIteration = iterator0.hasNext() || iterator1.hasNext();
+ while (continueIteration){
+ String item0 = "<null>";
+ String item1 = "<null>";
+ sb.append(" ");
+ if (iterator0.hasNext()){
+ item0 = iterator0.next();
+ }
+ if (iterator1.hasNext()){
+ item1 = iterator1.next();
+ }
+ sb.append(" ");
+ sb.append(item0);
+ sb.append(item0.equals(item1) ? " == " : " != ");
+ sb.append(item1);
+ continueIteration = iterator0.hasNext() || iterator1.hasNext();
+ if (continueIteration){
+ sb.append("\n");
+ }
+ }
+ }
+ return sb.toString();
+ }
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-14 10:57:18 UTC (rev 32087)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2011-06-14 13:38:02 UTC (rev 32088)
@@ -40,32 +40,33 @@
* @param expectedOpenedFileName
*/
public static SWTBotEditor checkOpenOnFileIsOpened(SWTBotExt bot,
- String editorTitle, String textToSelect ,
- int selectionOffset , int selectionLength , int textToSelectIndex,
- String expectedOpenedFileName){
-
+ String editorTitle, String textToSelect, int selectionOffset,
+ int selectionLength, int textToSelectIndex, String expectedOpenedFileName) {
+
SWTBotEditor openedEditor = null;
-
- SWTBotEclipseEditor sourceEditor = SWTJBTExt.selectTextInSourcePane(bot, editorTitle, textToSelect,
- selectionOffset, selectionLength, textToSelectIndex);
-
- bot.sleep(Timing.time1S());
-
- sourceEditor.setFocus();
-
- bot.sleep(Timing.time1S());
-
- KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_F3);
-
- bot.sleep(Timing.time3S());
-
- openedEditor = bot.activeEditor();
-
- assertTrue("Opened file has to have title " + expectedOpenedFileName + " but has " + openedEditor.getTitle(),
- openedEditor.getTitle().equalsIgnoreCase(expectedOpenedFileName));
-
- return openedEditor;
-
+
+ SWTBotEclipseEditor sourceEditor = SWTJBTExt.selectTextInSourcePane(bot,
+ editorTitle, textToSelect, selectionOffset, selectionLength,
+ textToSelectIndex);
+
+ bot.sleep(Timing.time1S());
+
+ sourceEditor.setFocus();
+
+ bot.sleep(Timing.time1S());
+
+ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_F3);
+
+ bot.sleep(Timing.time3S());
+
+ openedEditor = bot.activeEditor();
+
+ assertTrue("Opened file has to have title " + expectedOpenedFileName
+ + " but has " + openedEditor.getTitle(), openedEditor.getTitle()
+ .equalsIgnoreCase(expectedOpenedFileName));
+
+ return openedEditor;
+
}
}
14 years, 10 months
JBoss Tools SVN: r32087 - in trunk: flow/features/org.jboss.tools.flow.common.feature/sourceTemplateFeature and 17 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-06-14 06:57:18 -0400 (Tue, 14 Jun 2011)
New Revision: 32087
Modified:
trunk/flow/features/org.jboss.tools.flow.common.feature/feature.properties
trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplateFeature/feature.properties
trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/sourceTemplateFeature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/sourceTemplateFeature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.feature/feature.properties
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.properties
trunk/profiler/features/org.jboss.tools.profiler.feature/feature.properties
trunk/seam/features/org.jboss.tools.seam.feature/feature.properties
trunk/struts/features/org.jboss.tools.struts.feature/feature.properties
trunk/vpe/features/org.jboss.tools.vpe.feature/feature.properties
Log:
JBIDE-8997 fix copyright in features
Modified: trunk/flow/features/org.jboss.tools.flow.common.feature/feature.properties
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/flow/features/org.jboss.tools.flow.common.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=Flow Languages Common Tools
featureProvider=JBoss by Red Hat
description=This feature includes common tools for flow languages.
-copyright=Copyright 2009,2010 Red Hat, Inc.
+copyright=Copyright 2009-2011 Red Hat, Inc.
licenseURL=license.html
updateSiteName=JBossTools Update Site
license=Red Hat, Inc. licenses these features and plugins to you under \
Modified: trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplateFeature/feature.properties
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplateFeature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplateFeature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=Flow Languages Common Tools Sources
featureProvider=JBoss by Red Hat
description=This source feature includes common tools for flow languages.
-copyright=Copyright 2009,2010 Red Hat, Inc.
+copyright=Copyright 2009-2011 Red Hat, Inc.
licenseURL=license.html
updateSiteName=JBossTools Update Site
license=Red Hat, Inc. licenses these features and plugins to you under \
Modified: trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=jBPM 4 Graphical Editor and Tools
featureProvider=JBoss by Red Hat
description=This feature includes tools for jBPM 4.
-copyright=Copyright 2009,2010 Red Hat, Inc.
+copyright=Copyright 2009-2011 Red Hat, Inc.
licenseURL=license.html
updateSiteName=JBossTools Update Site
license=Red Hat, Inc. licenses these features and plugins to you under \
Modified: trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/sourceTemplateFeature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/sourceTemplateFeature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/sourceTemplateFeature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=jBPM 4 Graphical Editor and Tools Sources
featureProvider=JBoss by Red Hat
description=This source feature includes tools for jBPM 4.
-copyright=Copyright 2009,2010 Red Hat, Inc.
+copyright=Copyright 2009-2011 Red Hat, Inc.
licenseURL=license.html
updateSiteName=JBossTools Update Site
license=Red Hat, Inc. licenses these features and plugins to you under \
Modified: trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=Common tools for jBPM 3 and jBPM 4
featureProvider=JBoss by Red Hat
description=This feature includes common end-user tools for jBPM 3 and jBPM 4.
-copyright=Copyright 2009,2010 Red Hat, Inc.
+copyright=Copyright 2009-2011 Red Hat, Inc.
licenseURL=license.html
updateSiteName=JBossTools Update Site
license=Red Hat, Inc. licenses these features and plugins to you under \
Modified: trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/sourceTemplateFeature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/sourceTemplateFeature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/sourceTemplateFeature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=Common tools for jBPM 3 and jBPM 4 Sources
featureProvider=JBoss by Red Hat
description=This source feature includes common end-user tools for jBPM 3 and jBPM 4.
-copyright=Copyright 2010,2010 Red Hat, Inc.
+copyright=Copyright 2009-2011 Red Hat, Inc.
licenseURL=license.html
updateSiteName=JBossTools Update Site
license=Red Hat, Inc. licenses these features and plugins to you under \
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=jBPM 3 Tools Runtime
featureProvider=JBoss by Red Hat
description=This feature includes all end-user tools for jBPM 4, including runtime and sources.
-copyright=Copyright 2010 Red Hat, Inc.
+copyright=Copyright 2010-2011 Red Hat, Inc.
licenseURL=license.html
updateSiteName=JBossTools Update Site
license=Red Hat, Inc. licenses these features and plugins to you under \
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=jBPM 3 Tools SDK
featureProvider=JBoss by Red Hat
description=This feature includes all end-user tools for jBPM 3, including runtime and sources.
-copyright=Copyright 2010 Red Hat, Inc.
+copyright=Copyright 2010-2011 Red Hat, Inc.
licenseURL=license.html
updateSiteName=JBossTools Update Site
license=Red Hat, Inc. licenses these features and plugins to you under \
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,6 +1,6 @@
featureName=jBPM 3 Tests
featureProvider=JBoss by Red Hat
-copyright=Copyright 2010 Red Hat, Inc.
+copyright=Copyright 2010-2011 Red Hat, Inc.
# "description" property - description of the feature
description="This feature provides the tests for the tools that are provided for the jBPM 3 runtime."
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=jBPM 3 Tests SDK
featureProvider=JBoss by Red Hat
-copyright=Copyright 2010 Red Hat, Inc.
+copyright=Copyright 2010-2011 Red Hat, Inc.
# "description" property - description of the feature
description="This feature provides the tests for the tools that are provided for the jBPM 3 runtime, including sources."
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=jBPM 4 Tools Runtime
featureProvider=JBoss by Red Hat
description=This feature includes all end-user tools for jBPM 4, including runtime and sources.
-copyright=Copyright 2010 Red Hat, Inc.
+copyright=Copyright 2010-2011 Red Hat, Inc.
licenseURL=license.html
updateSiteName=JBossTools Update Site
license=Red Hat, Inc. licenses these features and plugins to you under \
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=jBPM 4 Tools SDK
featureProvider=JBoss by Red Hat
description=This feature includes all end-user tools for jBPM 4, including runtime and sources.
-copyright=Copyright 2010 Red Hat, Inc.
+copyright=Copyright 2010-2011 Red Hat, Inc.
licenseURL=http://www.eclipse.org/legal/epl-v10.html
license=Red Hat, Inc. licenses these features and plugins to you under \
certain open source licenses (or aggregations of such licenses), which \
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=jBPM 4 Tests
featureProvider=JBoss by Red Hat
-copyright=Copyright 2010 Red Hat, Inc.
+copyright=Copyright 2010-2011 Red Hat, Inc.
# "description" property - description of the feature
description="This feature provides the tests for the tools that are provided for the jBPM 4 runtime."
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=jBPM 4 Tests SDK
featureProvider=JBoss by Red Hat
-copyright=Copyright 2010 Red Hat, Inc.
+copyright=Copyright 2010-2011 Red Hat, Inc.
# "description" property - description of the feature
description="This feature provides the tests for the tools that are provided for the jBPM 4 runtime, including sources."
Modified: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,7 +1,7 @@
featureName=jBPM jPDL Tools
featureProvider=JBoss by Red Hat
description=jBPM jPDL Tools
-copyright=Copyright 2010 Red Hat, Inc.
+copyright=Copyright 2010-2011 Red Hat, Inc.
licenseURL=http://www.eclipse.org/legal/epl-v10.html
license=Red Hat, Inc. licenses these features and plugins to you under \
certain open source licenses (or aggregations of such licenses), which \
Modified: trunk/profiler/features/org.jboss.tools.profiler.feature/feature.properties
===================================================================
--- trunk/profiler/features/org.jboss.tools.profiler.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/profiler/features/org.jboss.tools.profiler.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=Provides profiling for JBoss
-copyright=Copyright (c) 2007-2010 Red Hat, Inc.\n\
+copyright=Copyright 2007-2011 Red Hat, Inc.\n\
Distributed under license by Red Hat, Inc. All rights reserved.\n\
This program is made available under the terms of the\n\
Eclipse Public License v1.0 which accompanies this distribution,\n\
Modified: trunk/seam/features/org.jboss.tools.seam.feature/feature.properties
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/seam/features/org.jboss.tools.seam.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=Provides tooling for JBoss Seam.
-copyright=Copyright (c) 2007-2010 Red Hat, Inc.\n\
+copyright=Copyright 2007-2011 Red Hat, Inc.\n\
Distributed under license by Red Hat, Inc. All rights reserved.\n\
This program is made available under the terms of the\n\
Eclipse Public License v1.0 which accompanies this distribution,\n\
Modified: trunk/struts/features/org.jboss.tools.struts.feature/feature.properties
===================================================================
--- trunk/struts/features/org.jboss.tools.struts.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/struts/features/org.jboss.tools.struts.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -28,7 +28,7 @@
description=Struts Tools
# "copyright" property - text of the "Feature Update Copyright"
-copyright=Copyright (c) 2007-2010 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007-2011 Exadel, Inc and Red Hat, Inc.\n\
Distributed under license by Red Hat, Inc. All rights reserved.\n\
This program is made available under the terms of the\n\
Eclipse Public License v1.0 which accompanies this distribution,\n\
Modified: trunk/vpe/features/org.jboss.tools.vpe.feature/feature.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.feature/feature.properties 2011-06-14 08:22:40 UTC (rev 32086)
+++ trunk/vpe/features/org.jboss.tools.vpe.feature/feature.properties 2011-06-14 10:57:18 UTC (rev 32087)
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2010-2011 Red Hat, Inc. and others.
+# Copyright (c) 2007-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
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=Provides a visual page editor for xml based documents. Specific support for xhtml with HTML and JSF/Facelets support.
-copyright=Copyright (c) 2007-2010 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007-2011 Exadel, Inc and Red Hat, Inc.\n\
Distributed under license by Red Hat, Inc. All rights reserved.\n\
This program is made available under the terms of the\n\
Eclipse Public License v1.0 which accompanies this distribution,\n\
14 years, 10 months
JBoss Tools SVN: r32086 - trunk/deltacloud/features/org.jboss.tools.deltacloud.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-14 04:22:40 -0400 (Tue, 14 Jun 2011)
New Revision: 32086
Modified:
trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/feature.xml
Log:
[JBIDE-9105] removed client plugin from the feature
Modified: trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/feature.xml
===================================================================
--- trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/feature.xml 2011-06-14 08:17:16 UTC (rev 32085)
+++ trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/feature.xml 2011-06-14 08:22:40 UTC (rev 32086)
@@ -22,12 +22,12 @@
<import plugin="org.apache.log4j" version="1.2.13" match="greaterOrEqual"/>
</requires>
- <plugin
+<!-- <plugin
id="org.jboss.tools.deltacloud.client"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/> -->
<plugin
id="org.jboss.tools.deltacloud.core"
14 years, 10 months
JBoss Tools SVN: r32085 - trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-06-14 04:17:16 -0400 (Tue, 14 Jun 2011)
New Revision: 32085
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF
Log:
Allow the use of m2e 1.0.0
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-06-14 08:16:12 UTC (rev 32084)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-06-14 08:17:16 UTC (rev 32085)
@@ -11,8 +11,8 @@
org.eclipse.jdt.launching,
org.eclipse.ui.editors,
org.eclipse.ui.ide,
- org.eclipse.m2e.core;bundle-version="0.13.0",
- org.eclipse.m2e.maven.runtime;bundle-version="0.13.0",
+ org.eclipse.m2e.core;bundle-version="[0.13.0,1.0.100)",
+ org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,1.0.100)",
org.eclipse.jdt.core,
org.eclipse.ui.views
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
14 years, 10 months
JBoss Tools SVN: r32084 - in trunk/maven: plugins/org.jboss.tools.maven.project.examples/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-06-14 04:16:12 -0400 (Tue, 14 Jun 2011)
New Revision: 32084
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF
Log:
Expand the m2e version range to support subsequent embedder releases
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2011-06-14 06:53:00 UTC (rev 32083)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2011-06-14 08:16:12 UTC (rev 32084)
@@ -12,16 +12,16 @@
org.eclipse.wst.common.frameworks;visibility:=reexport,
org.eclipse.jst.common.frameworks;visibility:=reexport,
org.eclipse.wst.common.modulecore;visibility:=reexport,
- org.eclipse.m2e.core;bundle-version="[0.13.0,1.0.1)";visibility:=reexport,
- org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,1.0.1)";visibility:=reexport,
+ org.eclipse.m2e.core;bundle-version="[0.13.0,1.0.100)";visibility:=reexport,
+ org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,1.0.100)";visibility:=reexport,
org.eclipse.jdt.core;visibility:=reexport,
- org.eclipse.m2e.jdt;bundle-version="[0.13.0,1.0.1)";visibility:=reexport,
+ org.eclipse.m2e.jdt;bundle-version="[0.13.0,1.0.100)";visibility:=reexport,
org.eclipse.jst.j2ee;visibility:=reexport,
org.eclipse.jst.j2ee.web;visibility:=reexport,
org.jboss.tools.common;visibility:=reexport,
org.eclipse.jdt.launching;visibility:=reexport,
org.eclipse.ui.workbench;visibility:=reexport,
- org.eclipse.m2e.model.edit;bundle-version="[0.13.0,1.0.1)";visibility:=reexport,
+ org.eclipse.m2e.model.edit;bundle-version="[0.13.0,1.0.100)";visibility:=reexport,
org.eclipse.core.expressions,
org.maven.ide.eclipse.wtp;bundle-version="0.13.0";visibility:=reexport
Bundle-ActivationPolicy: lazy
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF 2011-06-14 06:53:00 UTC (rev 32083)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF 2011-06-14 08:16:12 UTC (rev 32084)
@@ -10,8 +10,8 @@
org.jboss.tools.maven.core,
org.jboss.tools.project.examples,
org.eclipse.ui.ide,
- org.eclipse.m2e.archetype.common;bundle-version="[0.13.0,1.0.1)",
- org.eclipse.m2e.core.ui;bundle-version="[0.13.0,1.0.1)"
+ org.eclipse.m2e.archetype.common;bundle-version="[0.13.0,1.0.100)",
+ org.eclipse.m2e.core.ui;bundle-version="[0.13.0,1.0.100)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2011-06-14 06:53:00 UTC (rev 32083)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2011-06-14 08:16:12 UTC (rev 32084)
@@ -36,8 +36,8 @@
org.eclipse.jst.jee.ejb,
org.eclipse.jst.jee.ui,
org.eclipse.jst.jee.web,
- org.eclipse.m2e.lifecyclemapping.defaults;bundle-version="[0.13.0,1.0.1)",
- org.eclipse.m2e.launching;bundle-version="[0.13.0,1.0.1)"
+ org.eclipse.m2e.lifecyclemapping.defaults;bundle-version="[0.13.0,1.0.100)",
+ org.eclipse.m2e.launching;bundle-version="[0.13.0,1.0.100)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-RegisterBuddy: org.apache.log4j
14 years, 10 months
JBoss Tools SVN: r32083 - branches/jbosstools-3.2.x/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-14 02:53:00 -0400 (Tue, 14 Jun 2011)
New Revision: 32083
Modified:
branches/jbosstools-3.2.x/build/pom.xml
Log:
backport changes in trunk to 32x branch; site builder is deprecated in favour of buils/aggregate/site builder
Modified: branches/jbosstools-3.2.x/build/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/pom.xml 2011-06-14 06:28:45 UTC (rev 32082)
+++ branches/jbosstools-3.2.x/build/pom.xml 2011-06-14 06:53:00 UTC (rev 32083)
@@ -9,8 +9,25 @@
<packaging>pom</packaging>
<profiles>
-
+ <!-- for bootstrapping the parent and target-platform poms via Mead, we need to be able to fetch from this folder and run
+ this profile (excluding all others); currently parent pom includes target-platform build too, so only need to build the parent
+
+ mvn clean install -P parent,\!libs,\!tests,\!jmx,\!archives,\!as,\!common,\!jst,\!xulrunner,\!vpe \
+ -P \!jsf,\!freemarker,\!hibernatetools,\!portlet,\!struts,\!smooks,\!cdi,\!birt,\!bpel,\!esb,\!seam,\!examples \
+ -P \!maven,\!ws,\!modeshape,\!flow,\!jbpm,\!gwt,\!deltacloud,\!runtime,\!usage,\!aggregate-coverage
+
+ -->
<profile>
+ <id>parent</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>parent</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>libs</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -251,7 +268,7 @@
<profile>
<id>workingset</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>../portlet</module>
@@ -291,7 +308,7 @@
<profile>
<id>profiler</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>../profiler</module>
@@ -577,6 +594,7 @@
<profile>
<id>deltacloud-bootstrap</id>
<modules>
+ <module>../tests</module>
<module>../as</module>
<module>../deltacloud</module>
</modules>
@@ -611,16 +629,6 @@
<module>../usage</module>
</modules>
</profile>
-
- <profile>
- <id>site</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../site</module>
- </modules>
- </profile>
<profile>
<id>aggregate-coverage</id>
14 years, 10 months