JBoss Tools SVN: r26266 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.richfaces/resources/subTableToggleControl and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-11-04 13:55:56 -0400 (Thu, 04 Nov 2010)
New Revision: 26266
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/subTableToggleControl/
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/subTableToggleControl/down_icon.gif
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/subTableToggleControl/up_icon.gif
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableToggleControlTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataScroller-RF4.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataScroller-RF4.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTableToggleControl.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTableToggleControl.xhtml.xml
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7449: Vpe templates for rich iteration.
Created templates:
- rich:dataScroller
- rich:subTableToggleControl
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/subTableToggleControl/down_icon.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/subTableToggleControl/down_icon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/subTableToggleControl/up_icon.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/subTableToggleControl/up_icon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableToggleControlTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableToggleControlTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableToggleControlTemplate.java 2010-11-04 17:55:56 UTC (rev 26266)
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.richfaces.template;
+
+import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.mapping.AttributeData;
+import org.jboss.tools.vpe.editor.mapping.VpeElementData;
+import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.editor.util.VisualDomUtil;
+import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMText;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Template for rich:subTableToggleControl.
+ *
+ * @author Yahor Radtsevich (yradtsevich)
+ *
+ */
+public class RichFacesSubTableToggleControlTemplate extends VpeAbstractTemplate {
+
+ private static final String DOWN_ICON_PATH = "/subTableToggleControl/down_icon.gif"; //$NON-NLS-1$
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
+ */
+ @Override
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+ Element sourceElement = (Element) sourceNode;
+
+ nsIDOMElement container = VisualDomUtil.createBorderlessContainer(visualDocument);
+ VpeCreationData creationData = new VpeCreationData(container);
+
+ if (sourceElement.hasAttribute(RichFaces.ATTR_COLLAPSE_LABEL)) {
+ Attr collapseLabelAttr = sourceElement.getAttributeNode(RichFaces.ATTR_COLLAPSE_LABEL);
+ nsIDOMElement link = visualDocument.createElement(HTML.TAG_A);
+
+ nsIDOMText collapseLabelText
+ = visualDocument.createTextNode(collapseLabelAttr.getNodeValue());
+ link.appendChild(collapseLabelText);
+
+ VpeElementData elementData = new VpeElementData();
+ creationData.setElementData(elementData);
+ elementData.addNodeData(new AttributeData(collapseLabelAttr, collapseLabelText, true));
+
+ container.appendChild(link);
+ } else {
+ nsIDOMElement img = visualDocument.createElement(HTML.TAG_IMG);
+ if (sourceElement.hasAttribute(RichFaces.ATTR_COLLAPSE_ICON)) {
+ String imgFullPath = VpeStyleUtil.addFullPathToImgSrc(
+ sourceElement.getAttribute(RichFaces.ATTR_COLLAPSE_ICON), pageContext, true);
+ img.setAttribute(HTML.ATTR_SRC, imgFullPath);
+ } else {
+ ComponentUtil.setImg(img, DOWN_ICON_PATH);
+ }
+
+ container.appendChild(img);
+ }
+
+ return creationData;
+ }
+}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2010-11-04 17:24:19 UTC (rev 26265)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2010-11-04 17:55:56 UTC (rev 26266)
@@ -32,6 +32,8 @@
public static final String ATTR_BREAK_BEFORE = "breakBefore"; //$NON-NLS-1$
public static final String ATTR_CAPTION_CLASS = "captionClass"; //$NON-NLS-1$
public static final String ATTR_CAPTION_STYLE = "captionStyle"; //$NON-NLS-1$
+ public static final String ATTR_COLLAPSE_ICON = "collapseIcon"; //$NON-NLS-1$
+ public static final String ATTR_COLLAPSE_LABEL = "collapseLabel"; //$NON-NLS-1$
public static final String ATTR_COLUMN_CLASSES = "columnClasses"; //$NON-NLS-1$
public static final String ATTR_COLUMNS = "columns"; //$NON-NLS-1$
public static final String ATTR_COLUMNS_WIDTH = "columnsWidth"; //$NON-NLS-1$
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2010-11-04 17:24:19 UTC (rev 26265)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2010-11-04 17:55:56 UTC (rev 26266)
@@ -251,6 +251,7 @@
</vpe:tag>
+ <!-- keep in mind that there is the same template for RF 4.0 rich:dataScroller (below)-->
<vpe:tag name="rich:datascroller" case-sensitive="yes">
<vpe:template children="yes" modify="yes"
class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataTableScrollerTemplate">
@@ -804,6 +805,30 @@
</vpe:dnd>
</vpe:template>
</vpe:tag>
+ <vpe:tag name="rich:dataScroller" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataTableScrollerTemplate">
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ <vpe:drop container="yes">
+ <vpe:container-child tag-name="f:facet" />
+ </vpe:drop>
+ </vpe:dnd>
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="rich:subTableToggleControl" case-sensitive="yes">
+ <vpe:template children="no" modify="yes"
+ class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesSubTableToggleControlTemplate">
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ <vpe:drop container="no"/>
+ </vpe:dnd>
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="rich:clientId" case-sensitive="yes">
<vpe:template children="no" modify="no">
</vpe:template>
@@ -824,5 +849,5 @@
<vpe:template children="no" modify="no">
</vpe:template>
</vpe:tag>
-
+
</vpe:templates>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataScroller-RF4.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataScroller-RF4.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataScroller-RF4.xhtml 2010-11-04 17:55:56 UTC (rev 26266)
@@ -0,0 +1,83 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+</head>
+<body>
+<h:form>
+ <h1>dataScroller</h1>
+ <rich:dataScroller id="dataScroller" for="dataTable" align="right" >
+ </rich:dataScroller>
+
+ <rich:dataTable cellpadding="0" cellspacing="0" width="700" border="0"
+ var="row" value="#{bean.dtList}" rowKeyVar="rowKey" id="dataTable"
+ rows="2">
+
+ <f:facet name="header">
+ <rich:columnGroup>
+ <rich:column rowspan="2">
+ <rich:spacer />
+ </rich:column>
+ <rich:column colspan="3">
+ <h:outputText value="FIELDS" />
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="field1" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="field2" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="field3" />
+ </rich:column>
+ </rich:columnGroup>
+ </f:facet>
+
+
+ <rich:columnGroup>
+ <rich:column>
+ <h:outputText value="#{rowKey}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{row.field1}">
+ </h:outputText>
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{row.field2}">
+ </h:outputText>
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{row.field3}">
+ </h:outputText>
+ </rich:column>
+
+ </rich:columnGroup>
+
+
+
+ <f:facet name="footer">
+
+ <rich:columnGroup>
+ <rich:column></rich:column>
+ <rich:column>
+ <h:outputText value="footer1" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="footer2" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="footer3" />
+ </rich:column>
+
+ </rich:columnGroup>
+ </f:facet>
+
+ </rich:dataTable>
+</h:form>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataScroller-RF4.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataScroller-RF4.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataScroller-RF4.xhtml.xml 2010-11-04 17:55:56 UTC (rev 26266)
@@ -0,0 +1,31 @@
+<tests>
+ <test id="dataScroller">
+ <DIV ALIGN="right" CLASS="rich-datascr">
+ <TABLE CELLSPACING="1" CELLPADDING="0" BORDER="0"
+ CLASS="rich-dtascroller-table">
+ <TBODY>
+ <TR>
+ <TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">««</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">«</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">
+ </TD>
+ <TD ALIGN="center" CLASS="rich-datascr-act"> 1</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-inact"> 2</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-inact"> 3</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-inact"> 4</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-inact"> 5</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-inact"> 6</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-inact"> 7</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-inact"> 8</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-inact"> 9</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-inact"> 10</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-button">
+ </TD>
+ <TD ALIGN="center" CLASS="rich-datascr-button">»</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-button">»»</TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTableToggleControl.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTableToggleControl.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTableToggleControl.xhtml 2010-11-04 17:55:56 UTC (rev 26266)
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+ <h:form>
+ <b>Table 1</b>
+ <rich:dataTable value="#{carsBean.inventoryVendorLists}" var="list">
+ <rich:column>
+ <rich:subTableToggleControl id="control1" for="sbtbl"/>
+ <h:outputText value="#{list.vendor}" />
+ </rich:column>
+ <rich:subTable value="#{list.vendorItems}" var="item" id="sbtbl"
+ expandMode="client">
+ <rich:column>
+ <h:outputText value="#{item.model}" />
+ </rich:column>
+ </rich:subTable>
+ </rich:dataTable>
+
+ <b>Table 2</b>
+ <rich:dataTable value="#{carsBean.inventoryVendorLists}" var="list">
+ <rich:column>
+ <rich:subTableToggleControl id="control2" for="sbtbl" collapseLabel="collapse"/>
+ <h:outputText value="#{list.vendor}" />
+ </rich:column>
+ <rich:subTable value="#{list.vendorItems}" var="item" id="sbtbl"
+ expandMode="client">
+ <rich:column>
+ <h:outputText value="#{item.model}" />
+ </rich:column>
+ </rich:subTable>
+ </rich:dataTable>
+
+ <b>Table 3</b>
+ <rich:dataTable value="#{carsBean.inventoryVendorLists}" var="list">
+ <rich:column>
+ <rich:subTableToggleControl id="control3" for="sbtbl" collapseIcon="images/icons/copy.gif"/>
+ <h:outputText value="#{list.vendor}" />
+ </rich:column>
+ <rich:subTable value="#{list.vendorItems}" var="item" id="sbtbl"
+ expandMode="client">
+ <rich:column>
+ <h:outputText value="#{item.model}" />
+ </rich:column>
+ </rich:subTable>
+ </rich:dataTable>
+ </h:form>
+</ui:composition>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTableToggleControl.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTableToggleControl.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTableToggleControl.xhtml.xml 2010-11-04 17:55:56 UTC (rev 26266)
@@ -0,0 +1,16 @@
+<tests>
+ <test id="control1">
+ <SPAN CLASS="vpe-text">
+ <IMG SRC="/.*/resources/subTableToggleControl/down_icon.gif/" />
+ </SPAN>
+ </test>
+ <test id="control2">
+ <SPAN CLASS="vpe-text"><A>collapse</A>
+ </SPAN>
+ </test>
+ <test id="control3">
+ <SPAN CLASS="vpe-text">
+ <IMG SRC="/.*pages/components/images/icons/copy.gif/" />
+ </SPAN>
+ </test>
+</tests>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2010-11-04 17:24:19 UTC (rev 26265)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2010-11-04 17:55:56 UTC (rev 26266)
@@ -78,6 +78,11 @@
performContentTest("components/datascroller.xhtml");//$NON-NLS-1$
}
+
+ public void testDataScrollerRF4() throws Throwable {
+
+ performContentTest("components/dataScroller-RF4.xhtml");//$NON-NLS-1$
+ }
public void testColumns() throws Throwable {
performContentTest("components/columns.xhtml");//$NON-NLS-1$
@@ -283,7 +288,11 @@
public void testSpacer() throws Throwable {
performContentTest("components/spacer.xhtml");//$NON-NLS-1$
}
-
+
+ public void testSubTableToggleControl() throws Throwable {
+ performContentTest("components/subTableToggleControl.xhtml");//$NON-NLS-1$
+ }
+
public void testSuggestionbox() throws Throwable {
performInvisibleTagTest("components/suggestionbox.xhtml", "suggestionBox"); //$NON-NLS-1$ //$NON-NLS-2$
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26265 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-04 13:24:19 -0400 (Thu, 04 Nov 2010)
New Revision: 26265
Added:
trunk/build/target-platform/latest.target
Modified:
trunk/build/target-platform/e361-wtp322.target
trunk/build/target-platform/target2targetTemplate.xsl
trunk/build/target-platform/targetUpdateFromRepo.xml
Log:
add support for creating a latest.target file, which replaces all repo URLs with a single one
Modified: trunk/build/target-platform/e361-wtp322.target
===================================================================
--- trunk/build/target-platform/e361-wtp322.target 2010-11-04 17:02:52 UTC (rev 26264)
+++ trunk/build/target-platform/e361-wtp322.target 2010-11-04 17:24:19 UTC (rev 26265)
@@ -229,4 +229,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
Added: trunk/build/target-platform/latest.target
===================================================================
--- trunk/build/target-platform/latest.target (rev 0)
+++ trunk/build/target-platform/latest.target 2010-11-04 17:24:19 UTC (rev 26265)
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
+<target includeMode="feature" name="e36-wtp32">
+ <!-- Pro tip: to convert
+ from org.eclipse.tptp.platform.xerces_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
+ to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.tptp.platform.xerces.feature.group"/>
+ using vi, apply this transform:
+ :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit version="\2" id="\1.feature.group"\/>/g
+ -->
+ <locations>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="0.10.2.20100623-1649" id="org.maven.ide.eclipse.feature.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="0.11.0.20101024-0955" id="org.maven.ide.eclipse.wtp.feature.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/subversive/0.7/headless-update-site/"/>
+</location> -->
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="1.6.2.v201005080631" id="javax.wsdl.feature.feature.group"/>
+ <unit version="2.0.8.v201005080400" id="org.apache.oro.feature.feature.group"/>
+ <unit version="1.0.0.v201005080400" id="org.jdom.feature.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.2"/>
+<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.2"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2/"/>
+</location> -->
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="1.9.12.v20100909-1551-H34-M2" id="org.mozilla.xulrunner.feature.feature.group"/>
+ <unit version="1.9.12.v20100909-1551-H34-M2" id="org.mozilla.xpcom.feature.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG" id="org.eclipse.tptp.platform.profile.server.feature.group"/>
+ <unit version="4.3.1.v201009092123-797908s73533D4H6D56" id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
+ <unit version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t" id="org.eclipse.tptp.platform.core.feature.group"/>
+ <unit version="4.5.1.v201009092123-797A18s73533L4F6D6D" id="org.eclipse.tptp.platform.jvmti.feature.group"/>
+ <unit version="4.5.1.v201009092123-7L7O8bBgJ9E99jAfGWEM" id="org.eclipse.tptp.platform.trace.feature.group"/>
+ <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.tptp.platform.xerces.feature.group"/>
+ <unit version="4.3.1.v201009092123-797908s73533D4H6D56" id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
+ <unit version="4.5.1.v201009092123-7H7BF8PAkF7B77ZARCNEK" id="org.eclipse.tptp.platform.probekit.feature.group"/>
+ <unit version="4.5.0.v201005032111-2-37w312116191612" id="org.eclipse.tptp.platform.commons.logging.feature.group"/>
+ <unit version="4.5.0.v201005032111-217E7w312116191611" id="org.eclipse.tptp.platform.jakarta.log4j.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="2.6.1.v20100914-1218" id="org.eclipse.emf.ecore.feature.group"/>
+ <unit version="2.6.1.v20100914-1218" id="org.eclipse.emf.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.emf.codegen.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.emf.common.feature.group"/>
+ <unit version="1.2.0.v20100914-1218" id="org.eclipse.emf.databinding.feature.group"/>
+ <unit version="2.6.1.v20100914-1218" id="org.eclipse.emf.codegen.ecore.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.emf.ecore.edit.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.emf.ecore.editor.feature.group"/>
+ <unit version="2.6.1.v20100914-1218" id="org.eclipse.emf.ecore.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.emf.edit.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.xsd.edit.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.xsd.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="2.0.0.595-dev-e36" id="org.eclipse.swtbot.eclipse.feature.group"/>
+ <unit version="2.0.0.595-dev-e36" id="org.eclipse.swtbot.eclipse.gef.feature.group"/>
+ <unit version="2.0.0.595-dev-e36" id="org.eclipse.swtbot.ide.feature.group"/>
+ <unit version="2.0.0.595-dev-e36" id="org.eclipse.swtbot.eclipse.test.junit4.feature.group"/>
+ <unit version="2.0.0.595-dev-e36" id="org.eclipse.swtbot.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="2.6.1.v20100617a-57B185wFfAqPz0Ef8mBsMkG-0hfS" id="org.eclipse.birt.osgi.runtime.sdk.feature.group"/>
+ <unit version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb" id="org.eclipse.birt.feature.group"/>
+ <unit version="2.6.1.v20100915-1750-35-7w31211A2602861" id="org.eclipse.birt.integration.wtp.feature.group"/>
+ <unit version="2.6.1.v20100709-7f9T7DFQCnv8nz0gRMa6NG1" id="org.eclipse.birt.chart.feature.group"/>
+ <unit version="2.6.1.v20100915-1750-3507w31211A2602861" id="org.eclipse.birt.chart.integration.wtp.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="1.1.0.v20090119-79318s73533B57" id="com.ibm.icu.base.feature.group"/>
+ <unit version="1.0.0.v20100510-7K7QErDzbb9z-yqHb55T7I" id="org.eclipse.equinox.server.core.feature.group"/>
+ <unit version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911" id="org.eclipse.cvs.feature.group"/>
+ <unit version="1.2.0.v20100427-7e7jEQFEp4jsWcboLU9l93" id="org.eclipse.help.feature.group"/>
+ <unit version="3.6.1.r361_v20100714-0800-7z8XFUSFLFlmgLc5z-Bvrt8-HVkH" id="org.eclipse.jdt.feature.group"/>
+ <unit version="3.6.1.r361_v20100909-9gF78GrkFqw7GrsZnvz0JWNTeb6fue6896L" id="org.eclipse.platform.feature.group"/>
+ <unit version="3.6.1.M20100909-0800" id="org.eclipse.platform.ide"/>
+ <unit version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi" id="org.eclipse.equinox.executable.feature.group"/>
+ <unit version="3.6.1.M20100909-0800" id="org.eclipse.platform.sdk"/>
+ <unit version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ" id="org.eclipse.pde.feature.group"/>
+ <unit version="3.6.1.r361_v20100714-0800-7Q7m6DDaKf5o2z-L9LxPSe6ygafz-KKIqk1rr_3j4dn7J" id="org.eclipse.sdk.feature.group"/>
+ <unit version="3.6.0.M20100909-0800" id="org.eclipse.rcp.id"/>
+ <unit version="3.6.0.M20100909-0800" id="org.eclipse.rcp.sdk.id"/>
+ <unit version="3.3.0.v20100427-44A77w31211642" id="org.eclipse.releng.tools.feature.group"/>
+ <unit version="3.6.1.M20100909-0800" id="org.eclipse.sdk.ide"/>
+ <unit version="3.3.0.v20100527-817fFcfFEdcVcRZlgyBRcVX" id="org.eclipse.sdk.examples.feature.group"/>
+ <unit version="3.3.0.v20100527" id="org.eclipse.sdk.examples.source.feature.group"/>
+ <unit version="3.6.0.v20100421-7V7RFiwFLSgEt4Pctn77c7J" id="org.eclipse.equinox.compendium.sdk.feature.group"/>
+ <unit version="3.6.0.v20100603-7sF99FsHFTw8HQBta4g33J3F" id="org.eclipse.equinox.core.sdk.feature.group"/>
+ <unit version="1.0.0.v20100510-4--9oB5855K7P" id="org.eclipse.equinox.p2.discovery.feature.feature.group"/>
+ <unit version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr" id="org.eclipse.equinox.p2.user.ui.feature.group"/>
+ <unit version="3.6.0.v20100503-9I7VGAeG8tz-BY6jz0w2HLRYr" id="org.eclipse.equinox.p2.sdk.feature.group"/>
+ <unit version="3.6.0.v20100421-7u7NFVgFN5JdPKPhDHd_6Yqc54uw" id="org.eclipse.equinox.serverside.sdk.feature.group"/>
+ <unit version="3.6.1.r361_v20100903-7H7R07v8rtOZyYbv1I6aZgou5z07" id="org.eclipse.equinox.sdk.feature.group"/>
+ <unit version="1.0.0.v20100421-79--EVVFNFFsFc" id="org.eclipse.equinox.weaving.sdk.feature.group"/>
+ <unit version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ" id="org.eclipse.equinox.server.jetty.feature.group"/>
+ <unit version="1.0.0.v20100503-7x7IFGOFQ74dz0POCNUBjA6L" id="org.eclipse.equinox.server.p2.feature.group"/>
+ <unit version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL" id="org.eclipse.pde.api.tools.ee.fragments.feature.group"/>
+ <unit version="1.1.0.M20100909-0800" id="org.eclipse.equinox.p2.ui.admin.rcp.product"/>
+ <unit version="1.0.0.v20100510-42A79oB5855K5E" id="org.eclipse.equinox.server.servletbridge.feature.group"/>
+ <unit version="1.0.0.v20100510-44DF8s734C48662444" id="org.eclipse.equinox.server.simple.feature.group"/>
+ <unit version="3.6.1.r361_v20100827-9OArFLdFjY-ThSQXmKvKz0_T" id="org.eclipse.rcp.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb" id="org.eclipse.birt.feature.group"/>
+ <unit version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6" id="org.eclipse.datatools.connectivity.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7J8x7FBWwUL6z-2z-fcrYC2s55KI" id="org.eclipse.datatools.enablement.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7P9i7KFDxNYrp4cjPjqnPaRKxeyT" id="org.eclipse.datatools.sdk.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7I977GFE9JfhdnBJPmBCYCq6w5-t" id="org.eclipse.datatools.enablement.sdk.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-2-07w31211518181A" id="org.eclipse.datatools.enablement.jdt.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-77078CcNBGKBZI_FcRd" id="org.eclipse.datatools.modelbase.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-77778eBmKDNOMgJvJ8Of7QBR" id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group"/>
+ <unit version="3.6.1.v20100908-1100-4507w31211A2403131" id="org.eclipse.draw2d.feature.group"/>
+ <unit version="3.6.1.v20100908-1100-777B181A3Bz-6B663E7974242" id="org.eclipse.gef.feature.group"/>
+ <unit version="1.2.0.v20100519-2050-67808yE5F-8HAH4HECF4242" id="org.eclipse.zest.feature.group"/>
+ <unit version="3.1.1.v201008191505" id="org.eclipse.uml2.feature.group"/>
+ <unit version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ" id="org.eclipse.rse.feature.group"/>
+ <!-- SAVARA dependencies -->
+ <!-- <unit version="1.2.0.201006151053" id="org.eclipse.stp.bpmn.feature.feature.group"/>
+ <unit version="1.4.1.v20100909-1000-37708s73533F5C1479I" id="org.eclipse.gmf.runtime.notation.feature.group"/>
+ <unit version="1.4.1.v20100909-1300-7d9A78FYnmMD7VBZOqOghp2tsgXc" id="org.eclipse.gmf.feature.group"/>
+ <unit version="2.3.0.v20100421-2359-7c7MFO2FLWUl0im8BjQMa9f" id="org.eclipse.gmf.tooling.feature.group"/>
+ <unit version="1.4.0.v20100521-1113-7P8W5FHV2CNOiy0niXURaw311A16" id="org.eclipse.gmf.runtime.thirdparty.feature.group"/>
+ <unit version="3.0.1.v20100818-1530-7B11AkF7AG8VAT3BRLA" id="org.eclipse.m2m.qvt.oml.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-36-8s734C367E3CBC7" id="org.eclipse.emf.workspace.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-377-8s734C3E7D15D6B" id="org.eclipse.emf.transaction.feature.group"/>
+ <unit version="3.0.1.R30x_v201008251030-79-7I8qD6z-DtD7E6BP9D5393" id="org.eclipse.ocl.feature.group"/>
+ <unit version="1.0.0.v20100831" id="org.eclipse.pde.junit.runtime.standalone.feature.group"/>
+ <unit version="2.1.0.v20100606-1530-7908_AkF7AG8KEM3CMFA" id="org.eclipse.m2m.qvt.oml.common.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6" id="org.eclipse.emf.validation.feature.group"/>
+ <unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/>
+ <unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> -->
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="1.0.301.v201007151900" id="org.eclipse.jst.jee"/>
+ <unit version="1.2.0.v201003040800" id="org.eclipse.wst.common.frameworks"/>
+ <unit version="1.4.102.v201008170019" id="org.eclipse.wst.common.project.facet.ui"/>
+ <unit version="1.0.301.v201007070907" id="org.eclipse.jst.jee.web"/>
+ <unit version="3.2.2.v201008170019-377AB8s73533J5J759F" id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
+
+ <unit version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj" id="org.eclipse.jst.ws.axis2tools.feature.feature.group"/>
+ <unit version="1.0.2.v201008232129-7H777DFAKlRiOX8lGdRoz0878J" id="org.eclipse.jst.ws.cxf.feature.feature.group"/>
+ <unit version="2.3.2.v201008242310-7N7UF75FD3wTgbUpoff0aT" id="org.eclipse.jpt.feature.feature.group"/>
+ <unit version="3.2.2.v201008170019-377AB8s73533J5H335L" id="org.eclipse.wst.common.fproj.feature.group"/>
+ <unit version="3.2.2.v201008190400-7b7GHf2FSK2WBLQ2D-mrubYEOrRh" id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
+ <unit version="3.2.2.v201008100100-7O7CFbKEMf84nUlEJyX7-SPQjhYZ" id="org.eclipse.wst.web_ui.feature.feature.group"/>
+ <unit version="3.2.2.v201008170029-7H7AFUQDxumQGOpBqffOY2f1qxDZ" id="org.eclipse.wst.xml_ui.feature.feature.group"/>
+ <unit version="1.1.2.v201009091745-7S7WFAPFIpS-1-NbCE6tnacCXKP" id="org.eclipse.wst.xsl.feature.feature.group"/>
+ <unit version="1.2.2.v201008170101-7C78FGMF9JgLWLMUUEMtXc" id="org.eclipse.wst.jsdt.feature.feature.group"/>
+ <unit version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3" id="org.eclipse.jsf.feature.feature.group"/>
+ <unit version="1.0.0.v201005241530-5--AkF7B77NBZBgBg" id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group"/>
+ <unit version="1.0.1.v201008232129-7E777CF8NcJSSK-UBTwXn" id="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
+ <unit version="3.2.1.v201007070821-52FMTAkF7B77UBR7W98" id="org.eclipse.jst.enterprise_core.feature.feature.group"/>
+ <unit version="3.2.2.v20100818b-777HFGRCcNBDiBjIbhBA8" id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
+ <unit version="3.2.0.v201005241530-208Z7w31211419" id="org.eclipse.jst.server_adapters.feature.feature.group"/>
+ <unit version="3.2.0.v201005241530-31FA28s73533C66" id="org.eclipse.jst.server_core.feature.feature.group"/>
+ <unit version="3.2.2.v20100908-7A5FEi9xFc7RCJMToAIOJC43A" id="org.eclipse.jst.server_ui.feature.feature.group"/>
+ <unit version="3.2.2.v201008170029-7F77FJSC25Tkdy1nqglPjqLAoDgh" id="org.eclipse.jst.web_ui.feature.feature.group"/>
+ <unit version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3" id="org.eclipse.jsf.feature.source.feature.group"/>
+ <unit version="1.1.5.v201009091745-67K2BgJ9DIAXCbBWJO" id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group"/>
+ <unit version="2.3.1.v20100906-4609oB5855L6N" id="org.eclipse.jst.webpageeditor.feature.feature.group"/>
+ <unit version="1.5.300.v201005241450-2407w312116191741" id="org.eclipse.wst.ws_wsdl15.feature.feature.group"/>
+ <unit version="3.2.2.v201008091400-7B7DFElF7RZHOZJ6W0PsNJ" id="org.eclipse.wst.common_core.feature.feature.group"/>
+ <unit version="3.2.2.v201008091400-7C78FPhEdhO_mXde7kbap_K7X1Qt" id="org.eclipse.wst.common_ui.feature.feature.group"/>
+ <unit version="3.2.0.v201005241510-51EoAkF77g8HBSc" id="org.eclipse.wst.server_adapters.feature.feature.group"/>
+ <unit version="3.2.2.v20100908-30F8V8s734C3I3K" id="org.eclipse.wst.server_core.feature.feature.group"/>
+ <unit version="3.2.2.v20100908-7B4FBrAtJb1nESKmCJHPGQ347" id="org.eclipse.wst.server_ui.feature.feature.group"/>
+ <unit version="3.2.2.v201008100100-7E7AFHwAJrn5PM15pUYBwJLkSG8j" id="org.eclipse.wst.web_core.feature.feature.group"/>
+ <unit version="3.2.2.v201008211705-7I78FZFEtEoO2c5BlJ4jPNvNC-yS" id="org.eclipse.wst.ws_ui.feature.feature.group"/>
+ <unit version="3.2.2.v201008170029-7C7OFXYF7RZHQHI5PyJwPT" id="org.eclipse.wst.xml_core.feature.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="1.3.3.v201006111317" id="com.google.gdt.eclipse.suite.e36.feature.feature.group"/>
+ <unit version="2.1.0.v201010280102" id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.0.feature.group"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+
+ <!-- additional JBoss.org mirrors -->
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ </location>
+ </locations>
+ <includeBundles>
+ <feature id="org.drools.eclipse.feature"/>
+ <feature id="org.drools.eclipse.task.feature"/>
+ <feature id="org.guvnor.tools.feature"/>
+ <feature id="org.mozilla.xulrunner.feature"/>
+ <feature id="org.mozilla.xpcom.feature"/>
+ </includeBundles>
+ <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/target2targetTemplate.xsl
===================================================================
--- trunk/build/target-platform/target2targetTemplate.xsl 2010-11-04 17:02:52 UTC (rev 26264)
+++ trunk/build/target-platform/target2targetTemplate.xsl 2010-11-04 17:24:19 UTC (rev 26265)
@@ -5,6 +5,8 @@
CAUTION: do not auto-format this file or line breaks will appear where they should not be!
-->
+<xsl:param name="published.URL"/>
+
<!-- Copy unit nodes and templatize their version attributes -->
<xsl:template match="unit">
<unit id="{@id}" version="${{{(a)id}.version}}">
@@ -12,6 +14,21 @@
</unit>
</xsl:template>
+<xsl:template match="repository">
+<xsl:choose>
+<xsl:when test="$published.URL">
+<repository location="{$published.URL}">
+<xsl:apply-templates/>
+</repository>
+</xsl:when>
+<xsl:otherwise>
+<repository location="{@location}">
+<xsl:apply-templates/>
+</repository>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
<!-- Copy everything else unchanged -->
<xsl:template match="@*|node()">
<xsl:copy>
@@ -19,4 +36,4 @@
</xsl:copy>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
Modified: trunk/build/target-platform/targetUpdateFromRepo.xml
===================================================================
--- trunk/build/target-platform/targetUpdateFromRepo.xml 2010-11-04 17:02:52 UTC (rev 26264)
+++ trunk/build/target-platform/targetUpdateFromRepo.xml 2010-11-04 17:24:19 UTC (rev 26265)
@@ -4,6 +4,11 @@
<property name="targetFile" value="e361-wtp322.target" />
<property name="repoDir" value="./REPO" />
+ <!-- create a second .target file which replaces all URLs with a single static PUBLISHED one
+ (eg., for jbosstools target platform site), set these properties too -->
+ <property name="published.targetFile" value="latest.target" />
+ <property name="published.URL" value="http://download.jboss.org/jbosstools/updates/target-platform/latest/" />
+
<property name="tmpDir" value="${java.io.tmpdir}/targetUpdateFromRepo" />
<property name="outputDir" value="${basedir}" />
<!-- Instead of overwriting, can also create a new .target file in a different outputDir
@@ -14,10 +19,13 @@
<echo>Must set these properties (or use defaults shown):
ant -f targetUpdateFromRepo.xml -DrepoDir=${repoDir} \
- -DtargetFile=${targetFile}</echo>
+ -DtargetFile=${targetFile} \
+ -Dpublished.targetFile=${published.targetFile} \
+ -Dpublished.URL=${published.URL}</echo>
</target>
- <target name="custom.build" depends="check.content.xml, get.content.xml, copy.content.xml, contentXml2artifactVersions.xsl, target2targetTemplate.xsl, updateTargetFile, cleanup" />
+ <target name="custom.build"
+ depends="check.content.xml, get.content.xml, copy.content.xml, contentXml2artifactVersions.xsl, target2targetTemplate.xsl, updateTargetFile, cleanup" />
<target name="check.content.xml" description="if content.jar, unpack to get content.xml">
<condition property="content.xml.exists" value="true">
@@ -41,6 +49,10 @@
<target name="target2targetTemplate.xsl" description="run target2targetTemplate.xsl to templatize .target file">
<echo level="verbose">Generate ${tmpDir}/${targetFile}.template</echo>
<xslt style="target2targetTemplate.xsl" in="${targetFile}" out="${tmpDir}/${targetFile}.template" processor="trax" />
+ <echo level="verbose">Generate ${tmpDir}/${published.targetFile}.template</echo>
+ <xslt style="target2targetTemplate.xsl" in="${targetFile}" out="${tmpDir}/${published.targetFile}.template" processor="trax">
+ <param name="published.URL" expression="${published.URL}" />
+ </xslt>
</target>
<target name="updateTargetFile" description="load generated properties and resolve them in the template to create a new .target file">
@@ -52,6 +64,13 @@
<expandproperties />
</filterchain>
</copy>
+ <copy todir="${outputDir}" overwrite="true">
+ <fileset file="${tmpDir}/${published.targetFile}.template" />
+ <mapper type="merge" to="${published.targetFile}" />
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
</target>
<target name="cleanup" description="purge temporary dir">
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26264 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-04 13:02:52 -0400 (Thu, 04 Nov 2010)
New Revision: 26264
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
Log:
[JBIDE-7499] extracted CVInstanceElementDialog to its own class to allow reuse for starting instances
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java 2010-11-04 17:02:52 UTC (rev 26264)
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.deltacloud.ui.commands;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.ListSelectionDialog;
+import org.jboss.tools.deltacloud.ui.views.CVInstanceElement;
+
+/**
+ * A dialog that allows the user to select CVInstanceElements
+ *
+ * @see CVInstanceElement
+ */
+public class CVInstanceElementsSelectionDialog extends ListSelectionDialog {
+
+ private static class DeltaCloudInstanceProvider implements IStructuredContentProvider {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Object[] getElements(Object cvInstanceElements) {
+ Assert.isTrue(cvInstanceElements instanceof Collection);
+ Collection<CVInstanceElement> instances = (Collection<CVInstanceElement>) cvInstanceElements;
+ return instances.toArray(new CVInstanceElement[instances.size()]);
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+ }
+
+ private static class CloudElementNameProvider extends LabelProvider {
+ public String getText(Object element) {
+ return ((CVInstanceElement) element).getName();
+ }
+ };
+
+ public CVInstanceElementsSelectionDialog(Shell parentShell, Collection<?> cloudViewElements, String title, String message) {
+ super(parentShell
+ , cloudViewElements
+ , new DeltaCloudInstanceProvider()
+ , new CloudElementNameProvider()
+ , message);
+ setTitle(title);
+ }
+}
\ No newline at end of file
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2010-11-04 16:54:57 UTC (rev 26263)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2010-11-04 17:02:52 UTC (rev 26264)
@@ -10,23 +10,16 @@
******************************************************************************/
package org.jboss.tools.deltacloud.ui.commands;
-import java.util.Collection;
import java.util.List;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
@@ -47,42 +40,8 @@
private final static String STOP_INSTANCES_DIALOG_TITLE = "StopInstancesDialog.title"; //$NON-NLS-1$
private final static String STOP_INSTANCES_DIALOG_MSG = "StopInstancesDialog.msg"; //$NON-NLS-1$
- public static class StopInstanceDialog extends ListSelectionDialog {
- private static class DeltaCloudInstanceProvider implements IStructuredContentProvider {
- @SuppressWarnings("unchecked")
- @Override
- public Object[] getElements(Object cvInstanceElements) {
- Assert.isTrue(cvInstanceElements instanceof Collection);
- Collection<CVInstanceElement> instances = (Collection<CVInstanceElement>) cvInstanceElements;
- return instances.toArray(new CVInstanceElement[instances.size()]);
- }
-
- @Override
- public void dispose() {
- }
-
- @Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
- private static class CloudElementNameProvider extends LabelProvider {
- public String getText(Object element) {
- return ((CVInstanceElement) element).getName();
- }
- };
-
- public StopInstanceDialog(Shell parentShell, Collection<?> cloudViewElements) {
- super(parentShell
- , cloudViewElements
- , new DeltaCloudInstanceProvider()
- , new CloudElementNameProvider(), CVMessages.getString(STOP_INSTANCES_DIALOG_TITLE));
- setTitle(CVMessages.getString(STOP_INSTANCES_DIALOG_MSG));
- }
- }
-
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
ISelection selection = HandlerUtil.getCurrentSelection(event);
@@ -107,9 +66,11 @@
@SuppressWarnings("unchecked")
private void stopWithDialog(IStructuredSelection selection) {
- StopInstanceDialog dialog = new StopInstanceDialog(
+ CVInstanceElementsSelectionDialog dialog = new CVInstanceElementsSelectionDialog(
UIUtils.getActiveShell()
- , (List<CVInstanceElement>) selection.toList());
+ , (List<CVInstanceElement>) selection.toList()
+ , CVMessages.getString(STOP_INSTANCES_DIALOG_TITLE)
+ , CVMessages.getString(STOP_INSTANCES_DIALOG_MSG));
if (Dialog.OK == dialog.open()) {
stopInstances(dialog.getResult());
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26263 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/commands and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-04 12:54:57 -0400 (Thu, 04 Nov 2010)
New Revision: 26263
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties
Log:
[JBIDE-7496] added dialog to stop several instances at once
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-04 16:32:51 UTC (rev 26262)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-04 16:54:57 UTC (rev 26263)
@@ -1,5 +1,9 @@
2010-11-04 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties:
+ [JBIDE-7496] added texts for dialog to stop several instances at once
+ * src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java (StopInstanceDialog):
+ [JBIDE-7496] added dialog to stop several instances at once
* src/org/jboss/tools/deltacloud/ui/views/ImageView.java (.modifyText):
[JBIDE-7498] do nothing if event's is triggered for cloud's that has been deleted
* src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java:
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2010-11-04 16:32:51 UTC (rev 26262)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2010-11-04 16:54:57 UTC (rev 26263)
@@ -10,13 +10,23 @@
******************************************************************************/
package org.jboss.tools.deltacloud.ui.commands;
+import java.util.Collection;
+import java.util.List;
+
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.ListSelectionDialog;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
@@ -34,18 +44,83 @@
private final static String STOPPING_INSTANCE_TITLE = "StoppingInstance.title"; //$NON-NLS-1$
private final static String STOPPING_INSTANCE_MSG = "StoppingInstance.msg"; //$NON-NLS-1$
+ private final static String STOP_INSTANCES_DIALOG_TITLE = "StopInstancesDialog.title"; //$NON-NLS-1$
+ private final static String STOP_INSTANCES_DIALOG_MSG = "StopInstancesDialog.msg"; //$NON-NLS-1$
+
+ public static class StopInstanceDialog extends ListSelectionDialog {
+ private static class DeltaCloudInstanceProvider implements IStructuredContentProvider {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Object[] getElements(Object cvInstanceElements) {
+ Assert.isTrue(cvInstanceElements instanceof Collection);
+ Collection<CVInstanceElement> instances = (Collection<CVInstanceElement>) cvInstanceElements;
+ return instances.toArray(new CVInstanceElement[instances.size()]);
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+ }
+
+ private static class CloudElementNameProvider extends LabelProvider {
+ public String getText(Object element) {
+ return ((CVInstanceElement) element).getName();
+ }
+ };
+
+ public StopInstanceDialog(Shell parentShell, Collection<?> cloudViewElements) {
+ super(parentShell
+ , cloudViewElements
+ , new DeltaCloudInstanceProvider()
+ , new CloudElementNameProvider(), CVMessages.getString(STOP_INSTANCES_DIALOG_TITLE));
+ setTitle(CVMessages.getString(STOP_INSTANCES_DIALOG_MSG));
+ }
+ }
+
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof IStructuredSelection) {
- CVInstanceElement cvInstance = UIUtils.getFirstElement(selection, CVInstanceElement.class);
- stopInstance(cvInstance);
+ IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+ if (isSingleInstance(structuredSelection)) {
+ CVInstanceElement cvInstance = UIUtils.getFirstElement(selection, CVInstanceElement.class);
+ stopInstance(cvInstance);
+ } else {
+ stopWithDialog(structuredSelection);
+ }
}
return Status.OK_STATUS;
}
+ private boolean isSingleInstance(IStructuredSelection selection) {
+ List<?> selectedItems = selection.toList();
+ return selectedItems.size() == 1
+ && selectedItems.get(0) instanceof CVInstanceElement;
+ }
+
+ @SuppressWarnings("unchecked")
+ private void stopWithDialog(IStructuredSelection selection) {
+ StopInstanceDialog dialog = new StopInstanceDialog(
+ UIUtils.getActiveShell()
+ , (List<CVInstanceElement>) selection.toList());
+ if (Dialog.OK == dialog.open()) {
+ stopInstances(dialog.getResult());
+ }
+ }
+
+ private void stopInstances(Object[] cvInstances) {
+ for (int i = 0; i < cvInstances.length; i++) {
+ stopInstance((CVInstanceElement) cvInstances[i]);
+ }
+ }
+
private void stopInstance(CVInstanceElement cvInstance) {
if (cvInstance != null) {
DeltaCloudInstance instance = (DeltaCloudInstance) cvInstance.getElement();
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-11-04 16:32:51 UTC (rev 26262)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-11-04 16:54:57 UTC (rev 26263)
@@ -49,6 +49,8 @@
StartingInstance.msg=Starting Instance: {0}
StoppingInstance.title=Stopping Instance
StoppingInstance.msg=Stopping Instance: {0}
+StopInstancesDialog.title=Stop Instances
+StopInstancesDialog.msg=Please choose the instance that shall be stopped by checking them:
RebootingInstance.title=Rebooting Instance
RebootingInstance.msg=Rebooting Instance: {0}
DestroyingInstance.title=Destroying Instance
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26262 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-04 12:32:51 -0400 (Thu, 04 Nov 2010)
New Revision: 26262
Modified:
trunk/build/parent/pom.xml
Log:
add -Dosgi.arch=x86 -XstartOnFirstThread to properly support macosx local testing
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-11-04 16:23:50 UTC (rev 26261)
+++ trunk/build/parent/pom.xml 2010-11-04 16:32:51 UTC (rev 26262)
@@ -446,7 +446,7 @@
</activation>
<properties>
<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
- <systemProperties combine.children="append"> -d32 </systemProperties>
+ <systemProperties combine.children="append"> -d32 -Dosgi.arch=x86 -XstartOnFirstThread </systemProperties>
</properties>
</profile>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26261 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/commands and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-04 12:23:50 -0400 (Thu, 04 Nov 2010)
New Revision: 26261
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DisconnectCloudsDialog.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java
Log:
[JBIDE-7498] I now do not popup dialog if:
- a single cloud is selected
I do popup a dialog if:
- several clouds are selected
OR
- a non-cloud element(s) is selected
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-04 16:05:46 UTC (rev 26260)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-04 16:23:50 UTC (rev 26261)
@@ -1,5 +1,7 @@
2010-11-04 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/ui/views/ImageView.java (.modifyText):
+ [JBIDE-7498] do nothing if event's is triggered for cloud's that has been deleted
* src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java:
[JBIDE-7484] removed instance related methods from client, unified funtionality in #performAction and offered additional methods on
Instance (#start, #stop, #destroy, #reboot). Furthermore update instance upon action responses from server.
@@ -8,6 +10,7 @@
* src/org/jboss/tools/deltacloud/ui/views/DisconnectCloudsDialog.java:
* src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java:
[JBIDE-7495] changed dialog and handler to climb up the hierarchy to the connection and offer to disconnect the cloud connection
+ [JBIDE-7495] delete cloud directly (no dialog) if single cloud is selected
2010-11-02 André Dietisheim <adietish(a)redhat.com>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2010-11-04 16:05:46 UTC (rev 26260)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2010-11-04 16:23:50 UTC (rev 26261)
@@ -19,42 +19,110 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.ListSelectionDialog;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
+import org.jboss.tools.deltacloud.ui.views.CVCloudElement;
+import org.jboss.tools.deltacloud.ui.views.CVMessages;
import org.jboss.tools.deltacloud.ui.views.CloudViewElement;
-import org.jboss.tools.deltacloud.ui.views.DisconnectCloudsDialog;
/**
* @author Andre Dietisheim
*/
public class DisconnectCloudHandler extends AbstractHandler implements IHandler {
+ public static class DisconnectCloudsDialog extends ListSelectionDialog {
+
+ private static final String CONFIRM_CLOUD_DELETE_TITLE = "ConfirmCloudDelete.title"; //$NON-NLS-1$
+ private static final String CONFIRM_CLOUD_DELETE_MSG = "ConfirmCloudDelete.msg"; //$NON-NLS-1$
+
+ private static class DeltaCloudItemProvider implements IStructuredContentProvider {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Object[] getElements(Object cloudViewElements) {
+ Assert.isTrue(cloudViewElements instanceof Collection);
+ Collection<DeltaCloud> deltaClouds = (Collection<DeltaCloud>) cloudViewElements;
+ return deltaClouds.toArray(new DeltaCloud[deltaClouds.size()]);
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+ }
+
+ private static class CloudElementNameProvider extends LabelProvider {
+ public String getText(Object element) {
+ return ((DeltaCloud) element).getName();
+ }
+ };
+
+ public DisconnectCloudsDialog(Shell parentShell, Collection<?> cloudViewElements) {
+ super(parentShell
+ , cloudViewElements
+ , new DeltaCloudItemProvider()
+ , new CloudElementNameProvider(), CVMessages.getString(CONFIRM_CLOUD_DELETE_MSG));
+ setTitle(CVMessages.getString(CONFIRM_CLOUD_DELETE_TITLE));
+ }
+ }
+
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof IStructuredSelection) {
- DisconnectCloudsDialog dialog = new DisconnectCloudsDialog(
- shell
- , getSelectedClouds(selection));
- if (Dialog.OK == dialog.open()) {
- removeCloudViewElements(dialog.getResult());
+ List<?> selectedElements = ((IStructuredSelection) selection).toList();
+ DeltaCloud deltaCloud = getFirstSelectedCloud(selectedElements);
+ if (selectedElements.size() == 1 && deltaCloud != null) {
+ removeDeltaCloud(deltaCloud);
+ } else {
+ removeWithDialog(shell, selectedElements);
}
}
return Status.OK_STATUS;
}
- private Collection<DeltaCloud> getSelectedClouds(ISelection selection) {
+ private void removeWithDialog(Shell shell, List<?> selectedElements) {
+ DisconnectCloudsDialog dialog = new DisconnectCloudsDialog(
+ shell
+ , getSelectedClouds(selectedElements));
+ if (Dialog.OK == dialog.open()) {
+ removeDeltaClouds(dialog.getResult());
+ }
+ }
+
+ private DeltaCloud getFirstSelectedCloud(List<?> selectedElements) {
+ DeltaCloud deltaCloud = null;
+ if (selectedElements.size() > 0) {
+ Object object = selectedElements.get(0);
+ if (object instanceof CVCloudElement) {
+ Object element = ((CVCloudElement) object).getElement();
+ if (element instanceof DeltaCloud) {
+ deltaCloud = (DeltaCloud) element;
+ }
+ }
+ }
+ return deltaCloud;
+ }
+
+ private Collection<DeltaCloud> getSelectedClouds(List<?> selectedElements) {
Set<DeltaCloud> selectedClouds = new HashSet<DeltaCloud>();
- List<?> selectedElements = ((IStructuredSelection) selection).toList();
for (Object element : selectedElements) {
DeltaCloud deltaCloud = getDeltaCloud(element);
if (deltaCloud != null) {
@@ -89,9 +157,13 @@
return getDeltaCloud((CloudViewElement) element.getParent());
}
- private void removeCloudViewElements(Object[] deltaClouds) {
+ private void removeDeltaClouds(Object[] deltaClouds) {
for (Object deltaCloud : deltaClouds) {
- DeltaCloudManager.getDefault().removeCloud((DeltaCloud) deltaCloud);
+ removeDeltaCloud((DeltaCloud) deltaCloud);
}
}
+
+ private void removeDeltaCloud(DeltaCloud deltaCloud) {
+ DeltaCloudManager.getDefault().removeCloud((DeltaCloud) deltaCloud);
+ }
}
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DisconnectCloudsDialog.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DisconnectCloudsDialog.java 2010-11-04 16:05:46 UTC (rev 26260)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DisconnectCloudsDialog.java 2010-11-04 16:23:50 UTC (rev 26261)
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.deltacloud.ui.views;
-
-import java.util.Collection;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-import org.jboss.tools.deltacloud.core.DeltaCloud;
-
-public class DisconnectCloudsDialog extends ListSelectionDialog {
-
- private static final String CONFIRM_CLOUD_DELETE_TITLE = "ConfirmCloudDelete.title"; //$NON-NLS-1$
- private static final String CONFIRM_CLOUD_DELETE_MSG = "ConfirmCloudDelete.msg"; //$NON-NLS-1$
-
- private static class DeltaCloudItemProvider implements IStructuredContentProvider {
-
- @SuppressWarnings("unchecked")
- @Override
- public Object[] getElements(Object cloudViewElements) {
- Assert.isTrue(cloudViewElements instanceof Collection);
- Collection<DeltaCloud> deltaClouds = (Collection<DeltaCloud>) cloudViewElements;
- return deltaClouds.toArray(new DeltaCloud[deltaClouds.size()]);
- }
-
- @Override
- public void dispose() {
- }
-
- @Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
- private static class CloudElementNameProvider extends LabelProvider {
- public String getText(Object element) {
- return ((DeltaCloud) element).getName();
- }
- };
-
- public DisconnectCloudsDialog(Shell parentShell, Collection<?> cloudViewElements) {
- super(parentShell
- , cloudViewElements
- , new DeltaCloudItemProvider()
- , new CloudElementNameProvider(), CVMessages.getString(CONFIRM_CLOUD_DELETE_MSG));
- setTitle(CVMessages.getString(CONFIRM_CLOUD_DELETE_TITLE));
- }
-}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-11-04 16:05:46 UTC (rev 26260)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-11-04 16:23:50 UTC (rev 26261)
@@ -76,16 +76,16 @@
private Label filterLabel;
@SuppressWarnings("unused")
private DeltaCloudImage selectedElement;
-
+
private DeltaCloud[] clouds;
private DeltaCloud currCloud;
-
+
private ImageViewLabelAndContentProvider contentProvider;
-
+
private Action refreshAction;
private Action filterAction;
private Action launchAction;
-
+
private ImageView parentView;
public ImageView() {
@@ -96,57 +96,60 @@
@Override
public void modifyText(ModifyEvent e) {
- int index = cloudSelector.getSelectionIndex();
- if (currCloud != null)
+ if (currCloud != null) {
currCloud.removeImageListListener(parentView);
- currCloud = clouds[index];
- Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
- try {
- prefs.put(IDeltaCloudPreferenceConstants.LAST_CLOUD_IMAGE_VIEW, currCloud.getName());
- } catch(Exception exc) {
- // do nothing
}
+ int index = cloudSelector.getSelectionIndex();
+ if (index >= 0) {
+ currCloud = clouds[index];
+ Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
+ try {
+ prefs.put(IDeltaCloudPreferenceConstants.LAST_CLOUD_IMAGE_VIEW, currCloud.getName());
+ } catch (Exception exc) {
+ // do nothing
+ }
- viewer.setInput(new DeltaCloudImage[0]);
- viewer.refresh();
- Display.getCurrent().asyncExec(new Runnable() {
+ viewer.setInput(new DeltaCloudImage[0]);
+ viewer.refresh();
+ Display.getCurrent().asyncExec(new Runnable() {
- @Override
- public void run() {
- viewer.setInput(currCloud);
- currCloud.addImageListListener(parentView);
- viewer.refresh();
-
- }
-
- });
+ @Override
+ public void run() {
+ viewer.setInput(currCloud);
+ currCloud.addImageListListener(parentView);
+ viewer.refresh();
+
+ }
+
+ });
+ }
}
-
};
-
+
private class ColumnListener extends SelectionAdapter {
-
+
private int column;
private TableViewer viewer;
-
+
public ColumnListener(int column, TableViewer viewer) {
this.column = column;
this.viewer = viewer;
}
+
@Override
public void widgetSelected(SelectionEvent e) {
- ImageComparator comparator = (ImageComparator)viewer.getComparator();
+ ImageComparator comparator = (ImageComparator) viewer.getComparator();
Table t = viewer.getTable();
if (comparator.getColumn() == column) {
comparator.reverseDirection();
}
comparator.setColumn(column);
- TableColumn tc = (TableColumn)e.getSource();
+ TableColumn tc = (TableColumn) e.getSource();
t.setSortColumn(tc);
t.setSortDirection(SWT.NONE);
viewer.refresh();
}
-
+
};
@Override
@@ -157,7 +160,7 @@
DeltaCloudManager.getDefault().removeCloudManagerListener(this);
super.dispose();
}
-
+
@Override
public void createPartControl(Composite parent) {
container = new Composite(parent, SWT.NULL);
@@ -165,10 +168,10 @@
layout.marginHeight = 0;
layout.marginWidth = 0;
container.setLayout(layout);
-
+
Label cloudSelectorLabel = new Label(container, SWT.NULL);
cloudSelectorLabel.setText(CVMessages.getString(CLOUD_SELECTOR_LABEL));
-
+
cloudSelector = new Combo(container, SWT.BORDER | SWT.READ_ONLY);
initializeCloudSelector();
cloudSelector.addModifyListener(cloudModifyListener);
@@ -180,15 +183,15 @@
e.doit = false;
}
});
-
+
filterLabel = new Label(container, SWT.NULL);
filterLabel.setText(CVMessages.getString(FILTERED_LABEL));
filterLabel.setToolTipText(CVMessages.getString(FILTERED_TOOLTIP));
-
+
Composite tableArea = new Composite(container, SWT.NULL);
TableColumnLayout tableLayout = new TableColumnLayout();
tableArea.setLayout(tableLayout);
-
+
viewer = new TableViewer(tableArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
Table table = viewer.getTable();
table.setHeaderVisible(true);
@@ -198,10 +201,10 @@
viewer.setLabelProvider(contentProvider);
ImageComparator comparator = new ImageComparator(0);
viewer.setComparator(comparator);
-
+
for (int i = 0; i < ImageViewLabelAndContentProvider.Column.getSize(); ++i) {
- ImageViewLabelAndContentProvider.Column c =
- ImageViewLabelAndContentProvider.Column.getColumn(i);
+ ImageViewLabelAndContentProvider.Column c =
+ ImageViewLabelAndContentProvider.Column.getColumn(i);
TableColumn tc = new TableColumn(table, SWT.NONE);
if (i == 0)
table.setSortColumn(tc);
@@ -210,7 +213,7 @@
tc.addSelectionListener(new ColumnListener(i, viewer));
}
table.setSortDirection(SWT.NONE);
-
+
if (currCloud != null) {
currCloud.removeImageListListener(parentView);
viewer.setInput(currCloud);
@@ -227,12 +230,12 @@
f.top = new FormAttachment(0, 5 + centering);
f.left = new FormAttachment(0, 30);
cloudSelectorLabel.setLayoutData(f);
-
+
f = new FormData();
f.top = new FormAttachment(0, 5);
f.left = new FormAttachment(cloudSelectorLabel, 5);
cloudSelector.setLayoutData(f);
-
+
f = new FormData();
f.top = new FormAttachment(0, 5 + centering);
f.right = new FormAttachment(100, -10);
@@ -244,17 +247,17 @@
f.right = new FormAttachment(100, 0);
f.bottom = new FormAttachment(100, 0);
tableArea.setLayoutData(f);
-
+
// Create the help context id for the viewer's control
PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "org.jboss.tools.deltacloud.ui.viewer");
makeActions();
hookContextMenu();
hookSelection();
contributeToActionBars();
-
+
DeltaCloudManager.getDefault().addCloudManagerListener(this);
}
-
+
private void hookSelection() {
viewer.addSelectionChangedListener(new ISelectionChangedListener() {
@Override
@@ -263,7 +266,7 @@
}
});
}
-
+
private void hookContextMenu() {
MenuManager menuMgr = new MenuManager("#PopupMenu");
menuMgr.setRemoveAllWhenShown(true);
@@ -285,9 +288,9 @@
private void handleSelection() {
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
- selectedElement = (DeltaCloudImage)selection.getFirstElement();
+ selectedElement = (DeltaCloudImage) selection.getFirstElement();
}
-
+
private void fillLocalPullDown(IMenuManager manager) {
manager.add(refreshAction);
manager.add(filterAction);
@@ -298,9 +301,9 @@
// Other plug-ins can contribute there actions here
manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
}
-
+
private void fillLocalToolBar(IToolBarManager manager) {
- //TODO
+ // TODO
}
private void makeActions() {
@@ -323,7 +326,7 @@
refreshAction.setToolTipText(CVMessages.getString(REFRESH));
refreshAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
-
+
filterAction = new Action() {
public void run() {
Display.getDefault().asyncExec(new Runnable() {
@@ -341,7 +344,7 @@
else
filterLabel.setVisible(false);
}
-
+
});
}
};
@@ -351,7 +354,7 @@
launchAction = new Action() {
public void run() {
ISelection selection = viewer.getSelection();
- final DeltaCloudImage image = (DeltaCloudImage)((IStructuredSelection)selection).getFirstElement();
+ final DeltaCloudImage image = (DeltaCloudImage) ((IStructuredSelection) selection).getFirstElement();
Display.getDefault().asyncExec(new Runnable() {
@Override
@@ -363,20 +366,20 @@
dialog.create();
dialog.open();
}
-
+
});
}
};
launchAction.setText(CVMessages.getString(LAUNCH_INSTANCE));
launchAction.setToolTipText(CVMessages.getString(LAUNCH_INSTANCE));
}
-
+
@Override
public void setFocus() {
// TODO Auto-generated method stub
}
-
+
private void initializeCloudSelector() {
int defaultIndex = 0;
clouds = DeltaCloudManager.getDefault().getClouds();
@@ -396,7 +399,7 @@
currCloud = clouds[defaultIndex];
}
}
-
+
public void changeEvent(int type) {
String currName = null;
int currIndex = 0;
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26260 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-04 12:05:46 -0400 (Thu, 04 Nov 2010)
New Revision: 26260
Modified:
trunk/build/parent/pom.xml
Log:
fix line break issues in parent pom
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-11-04 15:39:24 UTC (rev 26259)
+++ trunk/build/parent/pom.xml 2010-11-04 16:05:46 UTC (rev 26260)
@@ -125,8 +125,8 @@
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
- <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties}
- -Dusage_reporting_enabled=false</argLine>
+ <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+ <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</argLine>
<!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho -->
<!-- set useUIThread=true for regular ui tests -->
<!-- set useUIThread=false for swtbot tests (?) -->
@@ -445,8 +445,8 @@
</property>
</activation>
<properties>
- <systemProperties combine.children="append">-d32
- </systemProperties>
+ <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+ <systemProperties combine.children="append"> -d32 </systemProperties>
</properties>
</profile>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26259 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-04 11:39:24 -0400 (Thu, 04 Nov 2010)
New Revision: 26259
Modified:
trunk/build/parent/pom.xml
Log:
add new osx profile (-d32 flag) and reformat using m2eclipse
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-11-04 15:36:12 UTC (rev 26258)
+++ trunk/build/parent/pom.xml 2010-11-04 15:39:24 UTC (rev 26259)
@@ -20,7 +20,8 @@
<systemProperties></systemProperties>
<target.platform>e36-wtp32</target.platform>
<!-- could also use http://download.jboss.org/jbosstools/updates/target-platform/latest/ -->
- <target.platform.URL>file://home/hudson/static_build_env/jbds/target-platform/e361-wtp322.target/</target.platform.URL>
+ <target.platform.URL>file://home/hudson/static_build_env/jbds/target-platform/e361-wtp322.target/
+ </target.platform.URL>
</properties>
<build>
@@ -124,7 +125,8 @@
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
- <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</argLine>
+ <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties}
+ -Dusage_reporting_enabled=false</argLine>
<!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho -->
<!-- set useUIThread=true for regular ui tests -->
<!-- set useUIThread=false for swtbot tests (?) -->
@@ -202,7 +204,8 @@
</build>
</profile>
- <!-- Time saver: to build everything from scratch from a single local repo on Hudson cluster -->
+ <!-- Time saver: to build everything from scratch from a single local repo
+ on Hudson cluster -->
<profile>
<id>helios-local-target</id>
<activation>
@@ -223,7 +226,8 @@
</repositories>
</profile>
- <!-- Time saver: to build everything from scratch from a single repo containing all deps in .target -->
+ <!-- Time saver: to build everything from scratch from a single repo containing
+ all deps in .target -->
<profile>
<id>helios-remote-target</id>
<activation>
@@ -232,7 +236,8 @@
<repositories>
<repository>
<id>jbosstools-target-platform-repo</id>
- <url>http://download.jboss.org/jbosstools/updates/target-platform/latest/</url>
+ <url>http://download.jboss.org/jbosstools/updates/target-platform/latest/
+ </url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -263,13 +268,18 @@
</activation>
<repositories>
<repository>
- <id>jbosstools-target-platform-repo</id>
- <url>http://download.jboss.org/jbosstools/updates/target-platform/latest/</url>
- <layout>p2</layout>
- <snapshots><enabled>true</enabled></snapshots>
- <releases><enabled>true</enabled></releases>
- </repository>
- <repository>
+ <id>jbosstools-target-platform-repo</id>
+ <url>http://download.jboss.org/jbosstools/updates/target-platform/latest/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>helios</id>
<url>http://download.eclipse.org/releases/helios/</url>
<layout>p2</layout>
@@ -427,6 +437,20 @@
</profile>
<profile>
+ <id>osx</id>
+ <activation>
+ <property>
+ <name>java.vendor.url</name>
+ <value>http://www.apple.com/</value>
+ </property>
+ </activation>
+ <properties>
+ <systemProperties combine.children="append">-d32
+ </systemProperties>
+ </properties>
+ </profile>
+
+ <profile>
<id>hudson</id>
<activation>
<property>
@@ -645,7 +669,8 @@
<repositories>
<repository>
<id>jbosstools-nightly-trunk</id>
- <url>http://download.jboss.org/jbosstools/updates/nightly/trunk/</url>
+ <url>http://download.jboss.org/jbosstools/updates/nightly/trunk/
+ </url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26258 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-11-04 11:36:12 -0400 (Thu, 04 Nov 2010)
New Revision: 26258
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java
Log:
fix NPEs during studio starting (https://jira.jboss.org/browse/JBIDE-7383)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java 2010-11-04 14:44:41 UTC (rev 26257)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java 2010-11-04 15:36:12 UTC (rev 26258)
@@ -86,6 +86,9 @@
JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editor;
VpeController vpeController = (VpeController) jspEditor
.getVisualEditor().getController();
+ if (vpeController == null) {
+ return;
+ }
/*
* Set new value to VpeVisualDomBuilder.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java 2010-11-04 14:44:41 UTC (rev 26257)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java 2010-11-04 15:36:12 UTC (rev 26258)
@@ -90,6 +90,9 @@
JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editor;
VpeController vpeController = (VpeController) jspEditor
.getVisualEditor().getController();
+ if (vpeController == null) {
+ return;
+ }
/*
* Update bundle messages.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java 2010-11-04 14:44:41 UTC (rev 26257)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java 2010-11-04 15:36:12 UTC (rev 26258)
@@ -87,6 +87,9 @@
JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editor;
VpeController vpeController = (VpeController) jspEditor
.getVisualEditor().getController();
+ if (vpeController == null) {
+ return;
+ }
/*
* Change flag
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26257 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-04 10:44:41 -0400 (Thu, 04 Nov 2010)
New Revision: 26257
Modified:
trunk/build/parent/pom.xml
Log:
disable helios target by default; remove cruft about SVN; remove extraneous plugin repos (eg., for tycho snapshots)
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-11-04 14:41:32 UTC (rev 26256)
+++ trunk/build/parent/pom.xml 2010-11-04 14:44:41 UTC (rev 26257)
@@ -177,7 +177,7 @@
<profile>
<id>helios</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<properties>
</properties>
@@ -244,35 +244,12 @@
</repositories>
</profile>
+ <!-- TODO: do we need this? -->
<profile>
<id>jbds-no-target</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <!--repositories>
- <repository>
- <id>jbosstools</id>
- <url>jar:file:///home/eskimo/Projects/jbds-build/jbosstools-src/adt.builder/downloads/toTransform/jbdevstudio-Update-4.0.0.v201009250226N-Beta1.zip!/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>eclipse-rcp</id>
- <url>jar:file:///home/eskimo/Projects/jbds-build/jbosstools-src/adt.builder/downloads/rcp.zip!/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories-->
</profile>
<!-- Time saver: to build everything from scratch (without target platform);
@@ -450,27 +427,6 @@
</profile>
<profile>
- <id>helios-maintenance-no-target</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>eclipse36x</id>
- <url>http://download.eclipse.org/eclipse/updates/3.6.x/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
-
- <profile>
<id>hudson</id>
<activation>
<property>
@@ -493,57 +449,6 @@
</build>
</profile>
<profile>
- <id>svn-repos</id>
- <repositories>
- <repository>
- <id>svnkit13</id>
- <url>http://eclipse.svnkit.com/1.3.x/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>subclipse16</id>
- <url>http://subclipse.tigris.org/update_1.6.x/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>subversive07</id>
- <url>http://download.eclipse.org/technology/subversive/0.7/update-site/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>subversive20</id>
- <url>http://community.polarion.com/projects/subversive/download/eclipse/2.0/up...
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
- <profile>
<id>coverage</id>
<activation>
<property>
@@ -751,6 +656,8 @@
</repository>
</repositories>
</profile>
+
+ <!-- TODO: remove this -->
<profile>
<id>dgolovin</id>
<activation>
@@ -829,50 +736,4 @@
</repositories>
</profile>
</profiles>
-
- <pluginRepositories>
- <pluginRepository>
- <id>sonatype-maven-central</id>
- <url>http://repository.sonatype.org/content/repositories/central/
- </url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>maven-snapshots-sonatype</id>
- <url>https://repository.apache.org/content/repositories/maven-snapshots-sonatype/
- </url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>tycho</id>
- <url>https://repository.sonatype.org/content/repositories/snapshots/
- </url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>apache-snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
</project>
15 years, 5 months
- 1
- 0