JBoss Tools SVN: r30280 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-04 15:40:31 -0400 (Mon, 04 Apr 2011)
New Revision: 30280
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
bump up swtbot to latest 2.0.4; bump up org.eclipse.datatools.connectivity.feature.feature.group to newer suffix value (which keeps getting overwritten)
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-04-04 18:26:24 UTC (rev 30279)
+++ trunk/build/target-platform/jbds.target 2011-04-04 19:40:31 UTC (rev 30280)
@@ -16,7 +16,7 @@
<unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.9.0.v201010181130-7I9O-FE9JfxXy1iz06uC_FrlImH-"/>
<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.9.0.v201010181130-7PA3-FEPPYupCWLDHfffcc2LJx83"/>
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBGKBZI_FcRd"/>
- <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"/>
+ <unit version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou" id="org.eclipse.datatools.connectivity.feature.feature.group"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7ACcNBGLEOIeD_WM"/>
@@ -145,4 +145,4 @@
<repository location="http://download.jboss.org/jbosstools/updates/indigo/"/>
</location>
</locations>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-04-04 18:26:24 UTC (rev 30279)
+++ trunk/build/target-platform/multiple.target 2011-04-04 19:40:31 UTC (rev 30280)
@@ -61,10 +61,10 @@
<unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20110128-1446"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="4.0.0.v20101008-79--87aC-AFJ6i5OwkX7DtDlQnz-"/>
<unit id="org.eclipse.birt.feature.group" version="4.0.0.v20101013-CJ8h7AGS7-BwX_RBv07XxGDko6kN"/>
@@ -189,7 +189,7 @@
<!-- avail in 3.3M5, not in M6; assume refactored to jpt.jpa
<unit id="org.eclipse.jpt.feature.feature.group" version="2.4.0.v201010040000-7L7_DNFBBoPabR8dYRjSP"/>
-->
- <unit version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb" id="org.eclipse.jpt.jpa.feature.feature.group"/>
+ <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201008101723-377DF8s73543C674AAA"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201008062100-7b7IHsyFSK2WCyUz0B1kvyUYCPoM"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMi9DwZ0CPsbmPPpz-VRW"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-04-04 18:26:24 UTC (rev 30279)
+++ trunk/build/target-platform/unified.target 2011-04-04 19:40:31 UTC (rev 30280)
@@ -16,7 +16,7 @@
<!-- m2e 0.13 + deps -->
<unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201103291237"/>
- <!-- should be 0.13.0.201103231111, not 0.11
+ <!-- should be 0.13.0.201103231111, not 0.11
:%s/<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.1.20101108-1810"\/> /<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201103231111"\/> /g
-->
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201103231111"/>
@@ -61,10 +61,10 @@
<unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20110128-1446"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="4.0.0.v20101008-79--87aC-AFJ6i5OwkX7DtDlQnz-"/>
<unit id="org.eclipse.birt.feature.group" version="4.0.0.v20101013-CJ8h7AGS7-BwX_RBv07XxGDko6kN"/>
@@ -189,7 +189,7 @@
<!-- avail in 3.3M5, not in M6; assume refactored to jpt.jpa
<unit id="org.eclipse.jpt.feature.feature.group" version="2.4.0.v201010040000-7L7_DNFBBoPabR8dYRjSP"/>
-->
- <unit version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb" id="org.eclipse.jpt.jpa.feature.feature.group"/>
+ <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201008101723-377DF8s73543C674AAA"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201008062100-7b7IHsyFSK2WCyUz0B1kvyUYCPoM"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMi9DwZ0CPsbmPPpz-VRW"/>
13 years, 2 months
JBoss Tools SVN: r30279 - branches/jbosstools-3.2.x/modeshape/plugins.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2011-04-04 14:26:24 -0400 (Mon, 04 Apr 2011)
New Revision: 30279
Modified:
branches/jbosstools-3.2.x/modeshape/plugins/pom.xml
Log:
JBIDE-6656 Corrected invalid pom entry
Modified: branches/jbosstools-3.2.x/modeshape/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/modeshape/plugins/pom.xml 2011-04-04 18:21:21 UTC (rev 30278)
+++ branches/jbosstools-3.2.x/modeshape/plugins/pom.xml 2011-04-04 18:26:24 UTC (rev 30279)
@@ -8,8 +8,6 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.modeshape.rest</module>
- </modules>
- <modules>
<module>org.jboss.tools.modeshape.rest.doc.user</module>
</modules>
</project>
13 years, 2 months
JBoss Tools SVN: r30278 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor/tags and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-04-04 14:21:21 -0400 (Mon, 04 Apr 2011)
New Revision: 30278
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataScrollerTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataTableTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/SpacerTagTest.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
Log:
Added RichFaces Tags Tests
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-04-04 17:36:43 UTC (rev 30277)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-04-04 18:21:21 UTC (rev 30278)
@@ -34,10 +34,13 @@
import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest;
import org.jboss.tools.vpe.ui.bot.test.editor.selectionbar.SelectionBarTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.CalendarTagTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnsTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ComboBoxTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.CoreHTMLTagsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataDefinitionTagTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataScrollerTagTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataTableTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.EditorTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.FileUploadTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.InplaceInputTagTest;
@@ -45,8 +48,10 @@
import org.jboss.tools.vpe.ui.bot.test.editor.tags.JSFTagsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ListShuttleTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.PanelMenuTagTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.PanelTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.PickListTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ProgressTagTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.SpacerTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.TreeTagTest;
import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4556Test;
import org.jboss.tools.vpe.ui.bot.test.palette.CancelTagLibDefenitionTest;
@@ -125,6 +130,11 @@
suite.addTestSuite(EditorTagTest.class);
suite.addTestSuite(TreeTagTest.class);
suite.addTestSuite(CalendarTagTest.class);
+ suite.addTestSuite(PanelTagTest.class);
+ suite.addTestSuite(DataTableTagTest.class);
+ suite.addTestSuite(SpacerTagTest.class);
+ suite.addTestSuite(DataScrollerTagTest.class);
+ suite.addTestSuite(ColumnTagTest.class);
suite.addTestSuite(XhtmlFilePerformanceTest.class);
return new TestSetup(suite);
}
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnTagTest.java 2011-04-04 18:21:21 UTC (rev 30278)
@@ -0,0 +1,91 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+
+/**
+ * Tests Rich Faces DataTable Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class ColumnTagTest extends RichFacesTagsTest{
+ private static final String COLUMN_HEADER_VALUE = "!-*Column Header Value";
+ private static final String COLUMN_VALUE = "!-*Column Value";
+ @Override
+ protected void initPageContent() {
+ xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" +
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"\n" +
+ " xmlns:rich=\"http://richfaces.org/rich\"\n" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\">\n" +
+ "<head>\n" +
+ "</head>\n" +
+ "<body>\n" +
+ " <f:view>\n" +
+ " <rich:dataTable>\n" +
+ " <rich:column>\n" +
+ " <f:facet name=\"header\">\n" +
+ " <h:outputText value=\"" + ColumnTagTest.COLUMN_HEADER_VALUE + "\"/>\n" +
+ " </f:facet>\n" +
+ " <h:outputText value=\"" + ColumnTagTest.COLUMN_VALUE + "\"/>\n" +
+ " </rich:column>\n" +
+ " </rich:dataTable>\n" +
+ " </f:view>\n" +
+ " </body>\n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TR",
+ new String[]{"class"},
+ new String[]{"dr-table-subheader rich-table-subheader"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TD",
+ new String[]{"class"},
+ new String[]{"dr-table-subheadercell rich-table-subheadercell"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TR",
+ new String[]{"class"},
+ new String[]{"dr-table-firstrow rich-table-firstrow"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TD",
+ new String[]{"class"},
+ new String[]{"dr-table-cell rich-table-cell"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser,
+ ColumnTagTest.COLUMN_HEADER_VALUE,
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser,
+ ColumnTagTest.COLUMN_VALUE,
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ // check tag selection
+ xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("TD",2), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = xhtmlEditor.getSelection();
+ String hasToStartWith = "<rich:column>";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ String hasEndWith = "</rich:column>";
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().endsWith(hasEndWith));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataScrollerTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataScrollerTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataScrollerTagTest.java 2011-04-04 18:21:21 UTC (rev 30278)
@@ -0,0 +1,78 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+
+/**
+ * Tests Rich Faces datascroller Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class DataScrollerTagTest extends RichFacesTagsTest{
+ private static final String DATA_SCROLLER_STYLE = "background-color: red;";
+ @Override
+ protected void initPageContent() {
+ xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" +
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"\n" +
+ " xmlns:rich=\"http://richfaces.org/rich\"\n" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\">\n" +
+ "<head>\n" +
+ "</head>\n" +
+ "<body>\n" +
+ " <f:view>\n" +
+ " <rich:datascroller style=\"" + DataScrollerTagTest.DATA_SCROLLER_STYLE +"\">\n" +
+ " </rich:datascroller>\n" +
+ " </f:view>\n" +
+ " </body>\n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "DIV",
+ new String[]{"class","style"},
+ new String[]{"rich-datascr",DataScrollerTagTest.DATA_SCROLLER_STYLE},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TD",
+ new String[]{"class"},
+ new String[]{"rich-datascr-button rich-datascr-button-dsbld"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TD",
+ new String[]{"class"},
+ new String[]{"rich-datascr-act"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TD",
+ new String[]{"class"},
+ new String[]{"rich-datascr-inact"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ // check tag selection
+ xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DIV",4), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = xhtmlEditor.getSelection();
+ String hasToStartWith = "<rich:datascroller style=\"" + DataScrollerTagTest.DATA_SCROLLER_STYLE + "\"";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ String hasEndWith = "</rich:datascroller>";
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().endsWith(hasEndWith));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataScrollerTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataTableTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataTableTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataTableTagTest.java 2011-04-04 18:21:21 UTC (rev 30278)
@@ -0,0 +1,118 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+
+/**
+ * Tests Rich Faces DataTable Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class DataTableTagTest extends RichFacesTagsTest{
+ private static final String TABLE_HEADER_VALUE = "!-*Table Header Value";
+ private static final String COLUMN_HEADER_VALUE = "!-*Column Header Value";
+ private static final String COLUMN_0_VALUE = "!-*Column 0 Value";
+ private static final String COLUMN_1_VALUE = "!-*Column 1 Value";
+ @Override
+ protected void initPageContent() {
+ xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" +
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"\n" +
+ " xmlns:rich=\"http://richfaces.org/rich\"\n" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\">\n" +
+ "<head>\n" +
+ "</head>\n" +
+ "<body>\n" +
+ " <f:view>\n" +
+ " <rich:dataTable>\n" +
+ " <f:facet name=\"header\">\n" +
+ " <h:outputText value=\"" + DataTableTagTest.TABLE_HEADER_VALUE + "\"></h:outputText>\n" +
+ " </f:facet>\n" +
+ " <rich:columns>\n" +
+ " <f:facet name=\"header\">\n" +
+ " <h:outputText value=\"" + DataTableTagTest.COLUMN_HEADER_VALUE + "\"/>\n" +
+ " </f:facet>\n" +
+ " <h:outputText value=\"" + DataTableTagTest.COLUMN_0_VALUE + "\" style=\"font-style:italic;\" />\n" +
+ " <h:outputText value=\"" + DataTableTagTest.COLUMN_1_VALUE + "\" />\n" +
+ " </rich:columns>\n" +
+ " </rich:dataTable>\n" +
+ " </f:view>\n" +
+ " </body>\n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TABLE",
+ new String[]{"class"},
+ new String[]{"dr-table rich-table"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TR",
+ new String[]{"class"},
+ new String[]{"dr-table-header rich-table-header"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TD",
+ new String[]{"class"},
+ new String[]{"dr-table-headercell rich-table-headercell"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TR",
+ new String[]{"class"},
+ new String[]{"dr-table-subheader rich-table-subheader"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TD",
+ new String[]{"class"},
+ new String[]{"dr-table-subheadercell rich-table-subheadercell"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TR",
+ new String[]{"class"},
+ new String[]{"dr-table-firstrow rich-table-firstrow"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TD",
+ new String[]{"class"},
+ new String[]{"dr-table-cell rich-table-cell"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser,
+ DataTableTagTest.TABLE_HEADER_VALUE,
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser,
+ DataTableTagTest.COLUMN_HEADER_VALUE,
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser,
+ DataTableTagTest.COLUMN_0_VALUE,
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser,
+ DataTableTagTest.COLUMN_1_VALUE,
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ // check tag selection
+ xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("THEAD",0), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = xhtmlEditor.getSelection();
+ String hasToStartWith = "<rich:dataTable>";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ String hasEndWith = "</rich:dataTable>";
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().endsWith(hasEndWith));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataTableTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelTagTest.java 2011-04-04 18:21:21 UTC (rev 30278)
@@ -0,0 +1,79 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+
+/**
+ * Tests Rich Faces Panel Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class PanelTagTest extends RichFacesTagsTest{
+ private static final String HEADER_VALUE = "!-*Header Value";
+ private static final String BODY_VALUE = "!-*Body Value";
+ @Override
+ protected void initPageContent() {
+ xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" +
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"\n" +
+ " xmlns:rich=\"http://richfaces.org/rich\"\n" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\">\n" +
+ " <head>\n" +
+ " </head>\n" +
+ " <body>\n" +
+ " <f:view>\n" +
+ " <rich:panel>\n" +
+ " <f:facet name=\"header\">\n" +
+ " <h:outputText value=\"" + PanelTagTest.HEADER_VALUE +"\"/>\n" +
+ " </f:facet>\n" +
+ " <h:outputText value=\"" + PanelTagTest.BODY_VALUE+ "\"/>\n" +
+ " </rich:panel>\n" +
+ " </f:view>\n" +
+ " </body>\n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "DIV",
+ new String[]{"class"},
+ new String[]{"dr-pnl rich-panel"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "DIV",
+ new String[]{"class"},
+ new String[]{"dr-pnl-b rich-panel-body"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser,
+ PanelTagTest.HEADER_VALUE,
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser,
+ PanelTagTest.BODY_VALUE,
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ // check tag selection
+ xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DIV",4), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = xhtmlEditor.getSelection();
+ String hasToStartWith = "<rich:panel>";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ String hasEndWith = "</rich:panel>";
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().endsWith(hasEndWith));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/SpacerTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/SpacerTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/SpacerTagTest.java 2011-04-04 18:21:21 UTC (rev 30278)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+
+/**
+ * Tests Rich Faces Spacer Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class SpacerTagTest extends RichFacesTagsTest{
+ private static final String SPACER_STYLE = "background-color: red;";
+ @Override
+ protected void initPageContent() {
+ xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" +
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"\n" +
+ " xmlns:rich=\"http://richfaces.org/rich\"\n" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\">\n" +
+ "<head>\n" +
+ "</head>\n" +
+ "<body>\n" +
+ " <f:view>\n" +
+ " <rich:spacer style=\"" + SpacerTagTest.SPACER_STYLE + "\"/>\n" +
+ " </f:view>\n" +
+ " </body>\n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "IMG",
+ new String[]{"width","height","class","style"},
+ new String[]{"1px","1px","rich-spacer",SpacerTagTest.SPACER_STYLE},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ // check tag selection
+ xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("IMG",0), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = xhtmlEditor.getSelection();
+ String hasToStartWith = "<rich:spacer";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ String hasEndWith = SpacerTagTest.SPACER_STYLE + "\"/>";
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().endsWith(hasEndWith));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/SpacerTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 2 months
JBoss Tools SVN: r30277 - trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-04-04 13:36:43 -0400 (Mon, 04 Apr 2011)
New Revision: 30277
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/Messages.java
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/messages.properties
Log:
https://issues.jboss.org/browse/JBDS-1573
added a warning dialog if the project doesn't have a deploy.xml in the bpel content folder
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2011-04-04 16:53:11 UTC (rev 30276)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2011-04-04 17:36:43 UTC (rev 30277)
@@ -27,14 +27,16 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.jboss.ide.eclipse.archives.webtools.modules.LocalZippedPublisherUtil;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
-import org.jboss.ide.eclipse.as.core.Messages;
+//import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
@@ -97,6 +99,20 @@
// Do nothing. This is intentional
publishState = IServer.PUBLISH_STATE_INCREMENTAL;
}
+ // https://issues.jboss.org/browse/JBDS-1573
+ // hack: display a warning dialog.
+ // Deployment validation should really be handled as a WizardFragment invoked from
+ // org.eclipse.wst.server.ui.internal.wizard.ModifyModulesWizard
+ // but there is no WizardFragment extension point for this class...
+ //
+ if (status!=null) {
+ final IStatus s = status;
+ Display.getDefault().syncExec( new Runnable() {
+ public void run() {
+ MessageDialog.openWarning(Display.getDefault().getActiveShell(), Messages.DeployError, s.getMessage());
+ }
+ });
+ }
return status == null ? Status.OK_STATUS : status;
}
@@ -109,6 +125,22 @@
IPath deployPath = getDeployPath(moduleTree, ds);
IPath tempDeployPath = PublishUtil.getTempDeployFolder(moduleTree, ds);
IModuleResource[] members = PublishUtil.getResources(last);
+ // https://issues.jboss.org/browse/JBDS-1573
+ // make sure the project has a deploy.xml (bpel-deploy.xml for backward compatibility).
+ boolean hasDeployXML = false;
+ for (int i=0; i<members.length; ++i) {
+ IModuleResource res = members[i];
+ String name = res.getName();
+ if ("deploy.xml".equals(name) || "bpel-deploy.xml".equals(name)) {
+ hasDeployXML = true;
+ break;
+ }
+ }
+ if (!hasDeployXML) {
+ MultiStatus ms = new MultiStatus(JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FULL_FAIL,
+ NLS.bind(Messages.MissingDeployXML, last.getName()), null);
+ return ms;
+ }
if( shouldZip() ) {
String deployRoot = PublishUtil.getDeployRootFolder(
moduleTree, ds, ds.getDeployFolder(),
@@ -125,7 +157,7 @@
pruneList(resultList);
if( resultList.size() > 0 ) {
MultiStatus ms = new MultiStatus(JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FULL_FAIL,
- NLS.bind(Messages.FullPublishFail, last.getName()), null);
+ NLS.bind(org.jboss.ide.eclipse.as.core.Messages.FullPublishFail, last.getName()), null);
for( int i = 0; i < resultList.size(); i++ )
ms.add(resultList.get(i));
return ms;
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/Messages.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/Messages.java 2011-04-04 16:53:11 UTC (rev 30276)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/Messages.java 2011-04-04 17:36:43 UTC (rev 30277)
@@ -31,4 +31,8 @@
// module validation
public static String InvalidFileExtension;
+ // https://issues.jboss.org/browse/JBDS-1573
+ // added for error dialog
+ public static String MissingDeployXML;
+ public static String DeployError;
}
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/messages.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/messages.properties 2011-04-04 16:53:11 UTC (rev 30276)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/messages.properties 2011-04-04 17:36:43 UTC (rev 30277)
@@ -1 +1,3 @@
InvalidFileExtension=BPEL module file resource must end with bpel file extension.
+MissingDeployXML=The project {0} does not have a BPEL deployment descriptor file (deploy.xml)"
+DeployError=Deployment Error
\ No newline at end of file
13 years, 2 months
JBoss Tools SVN: r30276 - branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2011-04-04 12:53:11 -0400 (Mon, 04 Apr 2011)
New Revision: 30276
Modified:
branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java
Log:
JBIDE-8242 The preference page that shows the versioning preference now is the only preference page that is shown when opening the preference page from the publishing wizard. This now matches the code in trunk.
Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java
===================================================================
--- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java 2011-04-04 16:40:00 UTC (rev 30275)
+++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java 2011-04-04 16:53:11 UTC (rev 30276)
@@ -50,7 +50,6 @@
import org.eclipse.ui.help.IWorkbenchHelpSystem;
import org.jboss.tools.modeshape.rest.Activator;
import org.jboss.tools.modeshape.rest.IServerRegistryListener;
-import org.jboss.tools.modeshape.rest.IUiConstants;
import org.jboss.tools.modeshape.rest.RestClientI18n;
import org.jboss.tools.modeshape.rest.ServerManager;
import org.jboss.tools.modeshape.rest.ServerRegistryEvent;
@@ -534,10 +533,10 @@
GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
gd.horizontalSpan = 2;
gd.minimumHeight = this.lstResources.getItemHeight() * 2; // set min
- // height
+ // height
gd.heightHint = this.lstResources.getItemHeight() * 10; // set
- // preferred
- // height
+ // preferred
+ // height
this.lstResources.setLayoutData(gd);
final org.eclipse.swt.widgets.List finalLst = this.lstResources;
@@ -726,8 +725,7 @@
// open preference page and only allow the pref page where the version
// setting is
PreferencesUtil.createPreferenceDialogOn(getShell(), MAIN_PREFERENCE_PAGE_ID,
- new String[] { MAIN_PREFERENCE_PAGE_ID, IUiConstants.Preferences.FILTERS_PREFERENCE_PAGE_ID }, null)
- .open();
+ new String[] { MAIN_PREFERENCE_PAGE_ID }, null).open();
}
/**
13 years, 2 months
JBoss Tools SVN: r30275 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-04 12:40:00 -0400 (Mon, 04 Apr 2011)
New Revision: 30275
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
refactor org.eclipse.jpt.feature.feature.group to org.eclipse.jpt.jpa.feature.feature.group in JBT TP
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-04-04 16:11:21 UTC (rev 30274)
+++ trunk/build/target-platform/multiple.target 2011-04-04 16:40:00 UTC (rev 30275)
@@ -186,7 +186,10 @@
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201102200555-377DF8s73543C6F6AAD"/>
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201009051717-7H78AKFAKlZgiH3jFfA3z0E6I6I"/>
+ <!-- avail in 3.3M5, not in M6; assume refactored to jpt.jpa
<unit id="org.eclipse.jpt.feature.feature.group" version="2.4.0.v201010040000-7L7_DNFBBoPabR8dYRjSP"/>
+ -->
+ <unit version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb" id="org.eclipse.jpt.jpa.feature.feature.group"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201008101723-377DF8s73543C674AAA"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201008062100-7b7IHsyFSK2WCyUz0B1kvyUYCPoM"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMi9DwZ0CPsbmPPpz-VRW"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-04-04 16:11:21 UTC (rev 30274)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-04-04 16:40:00 UTC (rev 30275)
@@ -159,7 +159,7 @@
<iu id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version=""/>
<iu id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version=""/>
<iu id="org.eclipse.jst.ws.cxf.feature.feature.group" version=""/>
-<iu id="org.eclipse.jpt.feature.feature.group" version=""/>
+<iu id="org.eclipse.jpt.jpa.feature.feature.group" version=""/>
<iu id="org.eclipse.wst.common.fproj.feature.group" version=""/>
<iu id="org.eclipse.jst.enterprise_ui.feature.feature.group" version=""/>
<iu id="org.eclipse.wst.web_ui.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-04-04 16:11:21 UTC (rev 30274)
+++ trunk/build/target-platform/unified.target 2011-04-04 16:40:00 UTC (rev 30275)
@@ -186,7 +186,10 @@
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201102200555-377DF8s73543C6F6AAD"/>
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201009051717-7H78AKFAKlZgiH3jFfA3z0E6I6I"/>
+ <!-- avail in 3.3M5, not in M6; assume refactored to jpt.jpa
<unit id="org.eclipse.jpt.feature.feature.group" version="2.4.0.v201010040000-7L7_DNFBBoPabR8dYRjSP"/>
+ -->
+ <unit version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb" id="org.eclipse.jpt.jpa.feature.feature.group"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201008101723-377DF8s73543C674AAA"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201008062100-7b7IHsyFSK2WCyUz0B1kvyUYCPoM"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMi9DwZ0CPsbmPPpz-VRW"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-04-04 16:11:21 UTC (rev 30274)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-04-04 16:40:00 UTC (rev 30275)
@@ -159,7 +159,7 @@
<iu id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version=""/>
<iu id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version=""/>
<iu id="org.eclipse.jst.ws.cxf.feature.feature.group" version=""/>
-<iu id="org.eclipse.jpt.feature.feature.group" version=""/>
+<iu id="org.eclipse.jpt.jpa.feature.feature.group" version=""/>
<iu id="org.eclipse.wst.common.fproj.feature.group" version=""/>
<iu id="org.eclipse.jst.enterprise_ui.feature.feature.group" version=""/>
<iu id="org.eclipse.wst.web_ui.feature.feature.group" version=""/>
13 years, 2 months
JBoss Tools SVN: r30274 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-04 12:11:21 -0400 (Mon, 04 Apr 2011)
New Revision: 30274
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
remove epp IUs from TP per Sneja and Max
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-04-04 16:11:04 UTC (rev 30273)
+++ trunk/build/target-platform/multiple.target 2011-04-04 16:11:21 UTC (rev 30274)
@@ -27,12 +27,14 @@
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="com.ning.async-http-client" version="1.6.3.20110315-1708"/>
<unit id="org.jboss.netty" version="3.2.4.Final"/>
+ <!-- probably not required per Sneja and Max
<unit id="org.eclipse.epp.mpc.core" version="1.0.0.v20100826-2143"/>
<unit id="org.eclipse.epp.mpc.help.ui" version="1.0.0.v20100826-2143"/>
<unit id="org.eclipse.epp.mpc.ui" version="1.1.0.I20110316-1744"/>
<unit id="org.eclipse.epp.usagedata.gathering" version="1.3.0.R201005261100"/>
<unit id="org.eclipse.epp.usagedata.recording" version="1.3.0.R201005261100"/>
<unit id="org.eclipse.epp.usagedata.ui" version="1.3.1.R201102081640"/>
+ -->
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110118-1616"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20100920"/>
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100920"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-04-04 16:11:04 UTC (rev 30273)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-04-04 16:11:21 UTC (rev 30274)
@@ -40,12 +40,6 @@
<iu id="org.slf4j.api" version=""/>
<iu id="com.ning.async-http-client" version=""/>
<iu id="org.jboss.netty" version=""/>
-<iu id="org.eclipse.epp.mpc.core" version=""/>
-<iu id="org.eclipse.epp.mpc.help.ui" version=""/>
-<iu id="org.eclipse.epp.mpc.ui" version=""/>
-<iu id="org.eclipse.epp.usagedata.gathering" version=""/>
-<iu id="org.eclipse.epp.usagedata.recording" version=""/>
-<iu id="org.eclipse.epp.usagedata.ui" version=""/>
<iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/>
<iu id="org.eclipse.equinox.p2.discovery" version=""/>
<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-04-04 16:11:04 UTC (rev 30273)
+++ trunk/build/target-platform/unified.target 2011-04-04 16:11:21 UTC (rev 30274)
@@ -27,12 +27,14 @@
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="com.ning.async-http-client" version="1.6.3.20110315-1708"/>
<unit id="org.jboss.netty" version="3.2.4.Final"/>
+ <!-- probably not required per Sneja and Max
<unit id="org.eclipse.epp.mpc.core" version="1.0.0.v20100826-2143"/>
<unit id="org.eclipse.epp.mpc.help.ui" version="1.0.0.v20100826-2143"/>
<unit id="org.eclipse.epp.mpc.ui" version="1.1.0.I20110316-1744"/>
<unit id="org.eclipse.epp.usagedata.gathering" version="1.3.0.R201005261100"/>
<unit id="org.eclipse.epp.usagedata.recording" version="1.3.0.R201005261100"/>
<unit id="org.eclipse.epp.usagedata.ui" version="1.3.1.R201102081640"/>
+ -->
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110118-1616"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20100920"/>
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100920"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-04-04 16:11:04 UTC (rev 30273)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-04-04 16:11:21 UTC (rev 30274)
@@ -40,12 +40,6 @@
<iu id="org.slf4j.api" version=""/>
<iu id="com.ning.async-http-client" version=""/>
<iu id="org.jboss.netty" version=""/>
-<iu id="org.eclipse.epp.mpc.core" version=""/>
-<iu id="org.eclipse.epp.mpc.help.ui" version=""/>
-<iu id="org.eclipse.epp.mpc.ui" version=""/>
-<iu id="org.eclipse.epp.usagedata.gathering" version=""/>
-<iu id="org.eclipse.epp.usagedata.recording" version=""/>
-<iu id="org.eclipse.epp.usagedata.ui" version=""/>
<iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/>
<iu id="org.eclipse.equinox.p2.discovery" version=""/>
<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
13 years, 2 months
JBoss Tools SVN: r30273 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-04 12:11:04 -0400 (Mon, 04 Apr 2011)
New Revision: 30273
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
Log:
update to M6 deps; refactor jpt.jpa features
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-04-04 14:32:31 UTC (rev 30272)
+++ trunk/build/target-platform/jbds.target 2011-04-04 16:11:04 UTC (rev 30273)
@@ -12,12 +12,12 @@
<!-- CVS -->
<unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110121-7B77FO-8sF7BA7FFU67UJ5"/>
- <!-- DTP -->
- <unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.9.0.v201010181130-7I9O-FE9JfxXy1iz06uC_FrlImG0"/>
- <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.9.0.v201010181130-7PA3-FEpPYupCWJDHfddcc2LJtA2"/>
+ <!-- DTP 1.9 -->
+ <unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.9.0.v201010181130-7I9O-FE9JfxXy1iz06uC_FrlImH-"/>
+ <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.9.0.v201010181130-7PA3-FEPPYupCWLDHfffcc2LJx83"/>
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBGKBZI_FcRd"/>
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"/>
- <unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7ECcNBHCFPKaCh_g"/>
+ <unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7ACcNBGLEOIeD_WM"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIax-vy-Mg9L"/>
@@ -52,75 +52,80 @@
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
- <!-- XSD -->
- <unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.6.0.v20110128-1446"/>
+ <!-- XSD 2.7 -->
+ <unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.6.0.v20110310-1804"/>
<unit id="org.eclipse.xsd.edit.feature.group" version="2.6.0.v20110128-1446"/>
<unit id="org.eclipse.xsd.editor.feature.group" version="2.6.0.v20110128-1446"/>
<unit id="org.eclipse.xsd.mapping.editor.feature.group" version="2.6.0.v20110128-1446"/>
<unit id="org.eclipse.xsd.mapping.feature.group" version="2.6.0.v20110128-1446"/>
<unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20110128-1446"/>
- <!-- EMF -->
+ <!-- EMF 2.7 -->
<unit id="org.eclipse.emf.feature.group" version="2.7.0.v20110128-1446"/>
- <!-- GEF 3.6.1 -->
- <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20101213-1100-46-7w3122123903161"/>
+ <!-- GEF 3.7 -->
+ <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20101213-1100-46-7w3122141903161"/>
<unit id="org.eclipse.gef.feature.group" version="3.7.0.v20101213-1100-777D-81B2Bz0656B376H34272"/>
- <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20101213-1100-67A-8yF4F0997J4B8O54272"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20101213-1100-67A-8yF4F09A9H4D6O54272"/>
- <!-- JDT 3.6.1 -->
+ <!-- JDT 3.7 -->
<unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110121-7z8fFb7FMTfESMtR15KlAcZ9H155"/>
- <!-- WTP SDK 3.2.2-20100915173744 -->
+ <!-- WTP SDK 3.3 -->
+ <!-- refactored to new feature name?
<unit id="org.eclipse.jpt.eclipselink.feature.feature.group" version="2.4.0.v201010040000-67BBgAkF7B97KES7777"/>
<unit id="org.eclipse.jpt.feature.feature.group" version="2.4.0.v201010040000-7L7_DNFBBoPabR8dYRjSP"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.3.0.v201012071101-7E7I7BF9JgLWRMmc5KKQl"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201008101723-377DF8s73543C6F6AAD"/>
+ -->
+ <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.0.0.v201103090650-7A7Z-F7RZHQPIcKqDKbWX"/>
+ <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb"/>
+
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.3.0.v201103022146-7E7I7GF9JgLWRMwSrNCTG"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201102200555-377DF8s73543C6F6AAD"/>
<unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.3.0.v201008062100-52FMTAkF7B77UBR7W98"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201008062100-7b7IHsyFSK2WCyUz0B1kvyUYCPoM"/>
- <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.0.v201008062100-62FSgBgJ9E99aEkFGAV"/>
- <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.101.v20100906-208_7w31211A17"/>
- <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.0.v20100812-777HFHyCcNBDjBcJYhBA8"/>
+ <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.0.v201102200555-62FSgBgJ9E99aEkFGAV"/>
+ <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.200.v201103051547-208_7w31211A17"/>
+ <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.0.v201102200555-777HFHyCcNBDjBeHV4BA8"/>
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201005241530-208Z7w31211419"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.3.0.v20101219-31FBW8s7353496D"/>
- <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.3.0.v20100908b-7A6FGH9xFc8uCJMTBAJLJJ43A"/>
+ <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7A6FHq9xFc8uCJMTBAJLJJ43A"/>
<unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.0.v201005241530-2-Eo7w3121162A3329"/>
- <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.3.0.v201008101217-7Q7DGHqFE9Le9JFJ-ca1Lkqjn2ps"/>
+ <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.3.0.v201102200555-7Q7DGHqFE9Le9JFQxpaxSuqjn2ps"/>
<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.2.v201012071101-4619oB5865D8M2338"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.3.0.v201011300734-7F7AFO-C25Toh9VqghsYz-3yYoz0"/>
- <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.3.0.v201008101217-2107w31211938"/>
+ <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-2107w31211938"/>
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201009051717-7H78AKFAKlZgiH3jFfA3z0E6I6I"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.100.v201101252155-5-A7AkF7B97HDVDRJZ"/>
- <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.100.v201009051717-7E78AKF8NcJSUKsU4Utal"/>
+ <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.100.v201102200555-7E78AKF8NcJSUKsU4Utal"/>
<unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.100.v201009051717-3-A78s73533L3D5H5H"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.3.0.v201008062100-7B7DFKvF7RZHObJjQuQ3RK"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.3.0.v201102150115-7B7DFMSF7RZHOcJiPqP-NJ"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201008101723-377DF8s73543C674AAA"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.3.0.v201008062100-7C79FSkEdhO_ocZe4kbemcKkRvR4"/>
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.3.0.v201101270151-7F78FUHFBBoPbSV-jGYxuY"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
- <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.0.v20100714b-30FA18s734D3A4Cc"/>
- <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.0.v20100714b-7B5FEwAtJb3LEKLfRKHHHIh47"/>
+ <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.0.v201102200555-30FA18s734D3A4Cc"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7B5FGVAtJb3LEKNfpKHHHIh47"/>
<unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.1.10.v201005241510-20Bg7w3121162A3236"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.3.0.v201010071250-7E7EFMRAJun6z0ky4qMUGvYO3c5N"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201010270400-7O7IFhJEMi9DuyLKBtQnDL7h6CJz"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.3.0.v201102200555-7E7EFMRAJun6z0o80wNSGpbLJMJ-"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMi9DwZ0CPsbmPPpz-VRW"/>
<unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201008062100-31Eo8s734B3E4H7799"/>
<unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.3.0.v201010270400-7L7RFi5FGtGd-pim1orHph2766"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.0.v201010270400-7I7AFbIEtEoVBjgCmL1mrYpBplar"/>
<unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201008132013-44FR79oB5855Q8IBD7G"/>
- <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201012090607-2407w312123151655"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.0.v201010070622-7C7OFchF7RZHQLIePtMmWd"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.0.v201007311522-7H7EFZ-DxumTlXlBWmRXNCTalsMT"/>
+ <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.0.v201102071641-7C7OFchF7RZHQLIiMz0Oh_k"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.0.v201102071641-7H7EFZ-DxumTlXt4mjdXgE-eiy04"/>
<unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201007311522-50FYwAkF7B77UBZFDBL"/>
- <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.2.0.v201008230020-67K8ZBgJ9DJBKFQBWIT"/>
+ <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.2.0.v201102200555-67K8ZBgJ9DKANEPBTGT"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.2.0.v201009121641-7S7ZFEyFIpS-8EvpOw2BQeGRCXJU"/>
<!-- RCP 3.6.1 -->
<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20101220-7P7NFUFFLWUl6m499UD1941"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.0.v20110122-2355-8A7RFtsFeDnQ5lZf7tez0TQA"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.0.v20110228-897TFncFdHjO2qRuCh_UvYT"/>
<unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
<unit id="org.eclipse.platform.feature.group" version="3.7.0.v20110121-9fF7OHGyFsAlpuWVeMel4CcNBmNslp8D-B"/>
- <unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110121-9FB3FkSFr3P0Mkw1JZW_QpZ"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5FiuFpBGyHd2xA_SWnfP"/>
<!-- UML -->
<unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201101271655"/>
@@ -131,13 +136,13 @@
<!-- RSE SDK 3.2.1 -->
<unit id="org.eclipse.rse.feature.group" version="3.3.0.v201101042155-7L7BFHk8wqin7rQp-b5xwxsfOPZF"/>
- <unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201101042155-31F8N8s7355353B75DD"/>
+ <unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/>
<unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201101042155-40-7w312212362934"/>
- <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201101042155-31-7w312212362832"/>
+ <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201103142315-31-7w312214253426"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201101042155-30-7w312213121A22"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201101042155-30-7w312212153266"/>
<repository location="http://download.jboss.org/jbosstools/updates/indigo/"/>
</location>
</locations>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-04-04 14:32:31 UTC (rev 30272)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-04-04 16:11:04 UTC (rev 30273)
@@ -78,8 +78,8 @@
<iu id="org.eclipse.gef.feature.group" version=""/>
<iu id="org.eclipse.zest.feature.group" version=""/>
<iu id="org.eclipse.jdt.feature.group" version=""/>
-<iu id="org.eclipse.jpt.eclipselink.feature.feature.group" version=""/>
-<iu id="org.eclipse.jpt.feature.feature.group" version=""/>
+<iu id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version=""/>
+<iu id="org.eclipse.jpt.jpa.feature.feature.group" version=""/>
<iu id="org.eclipse.jsf.feature.feature.group" version=""/>
<iu id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version=""/>
<iu id="org.eclipse.jst.enterprise_core.feature.feature.group" version=""/>
13 years, 2 months
JBoss Tools SVN: r30272 - branches/jbosstools-3.2.x/modeshape/plugins.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2011-04-04 10:32:31 -0400 (Mon, 04 Apr 2011)
New Revision: 30272
Modified:
branches/jbosstools-3.2.x/modeshape/plugins/pom.xml
Log:
JBIDE-6656
Modified: branches/jbosstools-3.2.x/modeshape/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/modeshape/plugins/pom.xml 2011-04-04 14:31:07 UTC (rev 30271)
+++ branches/jbosstools-3.2.x/modeshape/plugins/pom.xml 2011-04-04 14:32:31 UTC (rev 30272)
@@ -9,4 +9,7 @@
<modules>
<module>org.jboss.tools.modeshape.rest</module>
</modules>
+ <modules>
+ <module>org.jboss.tools.modeshape.rest.doc.user</module>
+ </modules>
</project>
13 years, 2 months
JBoss Tools SVN: r30271 - trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-04-04 10:31:07 -0400 (Mon, 04 Apr 2011)
New Revision: 30271
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java
Log:
* BPEL deploy test
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-04-04 14:30:43 UTC (rev 30270)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-04-04 14:31:07 UTC (rev 30271)
@@ -2,36 +2,70 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest;
import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper;
import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires;
+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.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
import org.jboss.tools.ui.bot.ext.view.ServersView;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
*
* @author psrna
*
*/
-@SWTBotTestRequires(perspective="BPEL Perspective")
+@SWTBotTestRequires(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL Perspective")
public class OdeDeployTest extends BPELTest {
static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
ServersView sView = new ServersView();
- ProjectExplorer projExplorer = new ProjectExplorer();
+ ProjectExplorer projExplorer = new ProjectExplorer(){
+
+ @Override
+ public void runOnServer(String projectName) {
+ String serverName = AssignActivityTest.configuredState.getServer().name;
+ //serverName = "SOA-5.1";
+
+ bot.viewByTitle("Servers").show();
+ bot.viewByTitle("Servers").setFocus();
+
+ SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
+ SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
+
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
+ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.ADD_AND_REMOVE, false)).click();
+
+ SWTBotShell shell = OdeDeployTest.bot.shell("Add and Remove...");
+ shell.activate();
+
+ SWTBot viewBot = shell.bot();
+ viewBot.tree().setFocus();
+ viewBot.tree().select(projectName);
+ viewBot.button("Add >").click();
+ viewBot.button("Finish").click();
+ }
+ };
- @Before
- public void setupWorkspace() throws Exception {
+ @BeforeClass
+ public static void setupWorkspace() throws Exception {
ResourceHelper.importProject(BUNDLE, "/projects/bpel_say_hello", "say_hello");
bot.viewByTitle("Project Explorer").setFocus();
- projExplorer.selectProject("say_hello");
}
@Test
- public void deployDescriptor() throws Exception {
+ public void deploymentDescriptorTest() throws Exception {
IFile deployFile = createNewDeployDescriptor("say_hello");
@@ -64,6 +98,24 @@
}
+ @Test
+ public void deployProjectTest() throws Exception {
+ String serverName = OdeDeployTest.configuredState.getServer().name;
+ // Publish the process
+ projExplorer.runOnServer("say_hello");
+ bot.sleep(TIME_5S);
+ Assert.assertFalse(console.getConsoleText().contains("DEPLOYMENTS IN ERROR:"));
+
+ bot.viewByTitle("Servers").show();
+ bot.viewByTitle("Servers").setFocus();
+
+ SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
+ SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
+ server.expand();
+ bot.sleep(TIME_5S);
+ assertTrue(server.getNode("say_hello [Synchronized]").isVisible());
+
+ }
@@ -71,12 +123,7 @@
+
-
-
-
-
-
-
}
13 years, 2 months