JBoss Tools SVN: r29489 - in trunk/hibernatetools/docs/reference/en-US: images/plugins and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-03-03 18:07:42 -0500 (Thu, 03 Mar 2011)
New Revision: 29489
Modified:
trunk/hibernatetools/docs/reference/en-US/images/plugins/diagram1.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/diagram2.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/diagramToolbar.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_19.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_19_b.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_19_c.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_19_d.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_20.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_21_a.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_21_b.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/prototypingQueries.png
trunk/hibernatetools/docs/reference/en-US/images/plugins/saveDiagram.png
trunk/hibernatetools/docs/reference/en-US/plugins.xml
Log:
"General editing and screenshot updates"
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/diagram1.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/diagram2.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/diagramToolbar.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_19.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_19_b.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_19_c.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_19_d.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_20.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_21_a.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/plugins_21_b.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/prototypingQueries.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/images/plugins/saveDiagram.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en-US/plugins.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en-US/plugins.xml 2011-03-03 23:05:19 UTC (rev 29488)
+++ trunk/hibernatetools/docs/reference/en-US/plugins.xml 2011-03-03 23:07:42 UTC (rev 29489)
@@ -1579,7 +1579,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>The next table describes all the extra options in the menu of mapping items:</para>
+ <para>The next table describes the additional options found in the mapping items context menu:</para>
<table>
<title>Extra Options in the Context Menu of Mapping Item</title>
<tgroup cols="3">
@@ -1615,7 +1615,7 @@
</entry>
<entry>
<para>
- Makes it possible to open the source file for a chosen object or element. The selected element will be highlighted in the open file.
+ Opens the source file for a chosen object or element. The selected element will be highlighted in the open file.
</para>
</entry>
</row>
@@ -1634,7 +1634,7 @@
</entry>
<entry>
<para>
- Makes it possible to open a mapping file for a chosen object/element. The selected element will be highlighted in the open file.
+ Opens a mapping file for a chosen object or element. The selected element will be highlighted in the open file.
</para>
</entry>
</row>
@@ -1652,7 +1652,7 @@
<para>Show|Hide shape(s)</para>
</entry>
<entry>
- <para>Used to hide/show an item on the mapping diagram</para>
+ <para>Used to hide or show an item on the mapping diagram</para>
</entry>
</row>
<row>
@@ -1669,7 +1669,7 @@
<para>Expand|Collapse shape(s)</para>
</entry>
<entry>
- <para>Used for expanding and collapsing fields of the item</para>
+ <para>Used to expand and collapse fields displayed by the item</para>
</entry>
</row>
</tbody>
@@ -1677,9 +1677,9 @@
</table>
<note>
<title>Tip:</title>
- <para>All the described types of the context menu are also available in the <guilabel>Outline</guilabel> view.</para>
+ <para>All these context menu options are also available in the <guilabel>Outline</guilabel> view.</para>
</note>
- <para>The following table lists the actions that can be performed using the keyboard keys (or keys combinations).</para>
+ <para>The following table lists the available keyboard shortcuts.</para>
<table>
<title>Hibernate Mapping Diagram Shortcut Keys</title>
<tgroup cols="2">
@@ -1754,7 +1754,7 @@
</tgroup>
</table>
<para>
- It is possible to save the diagram in the Eclipse workspace. Select <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Save As</guimenuitem></menuchoice>, and the wizard will ask you to set the location within you project where you wish to save the file and give the name for the diagram. The default name is the item's names concatenated with the ampersand symbols. The file is saved with the <filename>.hibernate</filename> extension.
+ It is possible to save the diagram in the Eclipse workspace. Select <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Save As</guimenuitem></menuchoice>, and the wizard will ask you to specify the location within you project where you wish to save the file, and provide the name for the diagram. The default name is the item's names concatenated with the ampersand symbols. The file is saved with the <filename>.hibernate</filename> extension.
</para>
<figure>
<title>The Diagram saved in the Workspace</title>
@@ -1848,7 +1848,7 @@
</entry>
<entry>
<para>
- Used to define scale of the diagram. It is also used for printing <guilabel>Mapping Diagrams</guilabel>. If you want to print the whole <guilabel>diagram</guilabel> to one print page, you need select the <guilabel>Page</guilabel> option in the <guilabel>Zoom Box</guilabel> drop down list.
+ Used to define scale of the diagram. It is also used for printing <guilabel>Mapping Diagrams</guilabel>. If you want to print the whole <guilabel>diagram</guilabel> to one page, you need select the <guilabel>Page</guilabel> option in the <guilabel>Zoom Box</guilabel> drop down list.
</para>
</entry>
</row>
@@ -1930,7 +1930,7 @@
<section>
<title>Prototyping Queries</title>
<para>
- Queries can be prototyped by entering them into the <guilabel>HQL</guilabel> or <guilabel>Criteria Editor</guilabel>. To execute a query click the green run button in the editor toolbar or press <keycombo><keycap>Ctrl</keycap><keycap>Enter</keycap></keycombo>.
+ Queries can be prototyped by entering them into the <guilabel>HQL</guilabel> or <guilabel>Criteria Editor</guilabel>. To execute a query click the green run button in the editor toolbar, or press <keycombo><keycap>Ctrl</keycap><keycap>Enter</keycap></keycombo>.
</para>
<section id="hql_and_criteria_editors">
<title>HQL Editor and Hibernate Criteria Editor</title>
@@ -1953,7 +1953,7 @@
</note>
<para>When they are opened, the editors they should automatically detect the chosen <guilabel>Console Configuration</guilabel>.</para>
<para>
- To get a prefill query for any entity (or any entity child node) listed in the <guilabel>Session Factory</guilabel> you should double-click it. This will open the <guilabel>HQL Editor</guilabel> with the associated query.
+ To generate a predefined query for any entity (or any entity child node) listed in the <guilabel>Session Factory</guilabel> you should double-click it. This will open the <guilabel>HQL Editor</guilabel> with the associated query.
</para>
<para>
Choosing <guimenuitem>HQL Editor</guimenuitem> in the context menu for any entity (or any entity child node) will also open the HQL Editor with the associated query. If you select <guimenuitem>Hibernate Criteria Editor</guimenuitem> in the context menu, it will open <guilabel>Hibernate Criteria Editor</guilabel> with the associated criteria.
@@ -1992,7 +1992,7 @@
</mediaobject>
</figure>
<para>
- Also you can pin the <guilabel>HQL editor</guilabel> and <guilabel>Criteria editor</guilabel> as a tab in the <property>Hibernate Query Result</property> view. For that you need click on the <guibutton>Stick result to one tab</guibutton> button (<inlinemediaobject><imageobject><imagedata fileref="images/plugins/sticky_but.png"/></imageobject></inlinemediaobject>). In this state query executions results will be shown in one tab (no more will be opened).
+ In addition, you can pin the <guilabel>HQL editor</guilabel> and <guilabel>Criteria editor</guilabel> as a tab in the <guilabel>Hibernate Query Result</guilabel> view. For that you need click on the <guibutton>Stick result to one tab</guibutton> button (<inlinemediaobject><imageobject><imagedata fileref="images/plugins/sticky_but.png"/></imageobject></inlinemediaobject>). In this state query executions results will be shown in one tab (no more will be opened).
</para>
<para>
You are able to rename the <guilabel>Hibernate Query Result</guilabel> tab. Click the tab, and type a new name in the <menuchoice><guimenuitem>Property View</guimenuitem><guimenuitem>Tab name</guimenuitem></menuchoice> field.
@@ -2009,10 +2009,10 @@
<section>
<title>Error Handling</title>
<para>
- Errors raised during the creation of the <guilabel>Session Factory</guilabel> or when executing the queries (e.g. if your configuration or query is incorrect) will be shown in a message dialog or inclined in the view that detected the error. You may get more information about the error in the <guilabel>Error Log View</guilabel> on the right pane.
+ Errors raised during the creation of the <guilabel>Session Factory</guilabel>, or when executing the queries (e.g. if your configuration or query is incorrect), will be shown in a message dialog or inclined in the view that detected the error. You may get more information about the error in the <guilabel>Error Log</guilabel> view on the right pane.
</para>
<para>
- Results of a query will be shown in the <guilabel>Hibernate Query Result View</guilabel> and details of possible errors (syntax errors, database errors, etc.) can be seen in the <guilabel>Error Log View</guilabel>.
+ Results of a query will be shown in the <guilabel>Hibernate Query Result</guilabel> view and details of possible errors (syntax errors, database errors, etc.) can be seen in the <guilabel>Error Log</guilabel> view.
</para>
<note>
<title>Note:</title>
@@ -2024,7 +2024,7 @@
<section>
<title>Dynamic Query Translator</title>
<para>
- If the <guilabel>Hibernate Dynamic Query Translator View</guilabel> is visible, it will show the generated SQL for a HQL query while you write in the <guilabel>HQL Editor</guilabel> .
+ If the <guilabel>Hibernate Dynamic Query Translator</guilabel> view is visible, it will show the generated SQL for a HQL query while you write in the <guilabel>HQL Editor</guilabel> .
</para>
<figure>
<title>Hibernate Dynamic Query Translator View</title>
@@ -2045,7 +2045,7 @@
<section>
<title>Properties View</title>
<para>
- As you can see in the figure below, when clicking on class or entity the <guilabel>Properties view</guilabel> shows the number of query results as well as the execution time.
+ As you can see in the figure below, when clicking on class or entity the <guilabel>Properties</guilabel> view shows the number of query results as well as the execution time.
</para>
<figure>
<title>Properties View</title>
@@ -2073,7 +2073,7 @@
</mediaobject>
</figure>
<para>
- You can also use <guilabel>Properties view</guilabel> when clicking on the configuration itself in Hibernate Configuration View (see <xref linkend="modif_console_conf"/>).
+ You can also use <guilabel>Properties</guilabel> view when clicking on the configuration itself in <guilabel>Hibernate Configuration</guilabel> view (see <xref linkend="modif_console_conf"/>).
</para>
</section>
</section>
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r29488 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-03-03 18:05:19 -0500 (Thu, 03 Mar 2011)
New Revision: 29488
Modified:
trunk/build/parent/pom.xml
Log:
use jboss.org mirrors where possible; remove commented stuff
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-03-03 23:04:55 UTC (rev 29487)
+++ trunk/build/parent/pom.xml 2011-03-03 23:05:19 UTC (rev 29488)
@@ -442,8 +442,8 @@
</releases>
</repository>
<repository>
- <id>webtools322</id>
- <url>http://download.eclipse.org/webtools/downloads/drops/R3.2.2/R-3.2.2-20100...
+ <id>jboss-webtools32</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2/
</url>
<layout>p2</layout>
<snapshots>
@@ -454,22 +454,8 @@
</releases>
</repository>
<repository>
- <id>webtools32</id>
- <url>http://download.eclipse.org/webtools/repository/helios</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <!-- <repository> <id>jboss-webtools32</id> <url>http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository> -->
- <repository>
- <id>birt26</id>
- <url>http://download.eclipse.org/birt/update-site/2.6/
+ <id>jboss-birt26</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/birt/2.6/
</url>
<layout>p2</layout>
<snapshots>
@@ -480,8 +466,8 @@
</releases>
</repository>
<repository>
- <id>swtbot-helios</id>
- <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ <id>jboss-swtbot-helios</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/
</url>
<layout>p2</layout>
<snapshots>
@@ -491,9 +477,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <!-- repository> <id>jboss-swtbot-helios</id> <url>http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository -->
<repository>
<id>m2eclipse</id>
<url>http://m2eclipse.sonatype.org/sites/m2e/</url>
@@ -516,22 +499,7 @@
<enabled>true</enabled>
</releases>
</repository>
- <!--repository> <id>jboss-orbit</id> <url>http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository -->
<repository>
- <id>jboss-thirdparty</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/thirdparty/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
<id>jboss-xulrunner-1.9.1.2</id>
<url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/
</url>
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r29487 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-03-03 18:04:55 -0500 (Thu, 03 Mar 2011)
New Revision: 29487
Modified:
trunk/build/target-platform/pom.xml
Log:
fix target platform pom in trunk to match 3.2.x, but with incremented version
Modified: trunk/build/target-platform/pom.xml
===================================================================
--- trunk/build/target-platform/pom.xml 2011-03-03 22:46:43 UTC (rev 29486)
+++ trunk/build/target-platform/pom.xml 2011-03-03 23:04:55 UTC (rev 29487)
@@ -6,7 +6,7 @@
<version>0.0.1-SNAPSHOT</version> </parent> -->
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.target.platform</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<name>JBoss Tools Target Platform Definition</name>
<packaging>pom</packaging>
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r29486 - branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-03 17:46:43 -0500 (Thu, 03 Mar 2011)
New Revision: 29486
Modified:
branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
Log:
JBIDE-8515
https://issues.jboss.org/browse/JBIDE-8515
Modified: branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2011-03-03 22:43:50 UTC (rev 29485)
+++ branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2011-03-03 22:46:43 UTC (rev 29486)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.ui.test.wizard;
+import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
@@ -373,7 +374,7 @@
}
}
- public void testNewBeanWizard() {
+ public void testNewBeanWizard() throws Exception {
WizardContext context = new WizardContext();
context.init("org.jboss.tools.cdi.ui.wizard.NewBeanCreationWizard",
PACK_NAME, BEAN_NAME);JobUtils.waitForIdle(2000);
@@ -392,6 +393,14 @@
assertTrue(text.contains("@Named"));
assertTrue(text.contains("\"myNewBean\""));
+
+ IType type = (IType)context.wizard.getCreatedElement();
+ int f = type.getFlags();
+ assertTrue(Modifier.isPublic(f));
+ assertFalse(Modifier.isAbstract(f));
+ String[] is = type.getSuperInterfaceNames();
+ assertEquals(1, is.length);
+ assertEquals("Serializable", is[0]);
} finally {
context.close();
}
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r29485 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-03 17:43:50 -0500 (Thu, 03 Mar 2011)
New Revision: 29485
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
Log:
JBIDE-8515
https://issues.jboss.org/browse/JBIDE-8515
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2011-03-03 22:22:27 UTC (rev 29484)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2011-03-03 22:43:50 UTC (rev 29485)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.ui.test.wizard;
+import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
@@ -391,7 +392,7 @@
}
}
- public void testNewBeanWizard() {
+ public void testNewBeanWizard() throws Exception {
WizardContext context = new WizardContext();
context.init("org.jboss.tools.cdi.ui.wizard.NewBeanCreationWizard",
PACK_NAME, BEAN_NAME);JobUtils.waitForIdle(2000);
@@ -410,6 +411,14 @@
assertTrue(text.contains("@Named"));
assertTrue(text.contains("\"myNewBean\""));
+
+ IType type = (IType)context.wizard.getCreatedElement();
+ int f = type.getFlags();
+ assertTrue(Modifier.isPublic(f));
+ assertFalse(Modifier.isAbstract(f));
+ String[] is = type.getSuperInterfaceNames();
+ assertEquals(1, is.length);
+ assertEquals("Serializable", is[0]);
} finally {
context.close();
}
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r29484 - branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-03 17:22:27 -0500 (Thu, 03 Mar 2011)
New Revision: 29484
Modified:
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
Log:
JBIDE-8515
https://issues.jboss.org/browse/JBIDE-8515
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java 2011-03-03 22:14:09 UTC (rev 29483)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java 2011-03-03 22:22:27 UTC (rev 29484)
@@ -58,7 +58,6 @@
import org.jboss.tools.cdi.core.ICDIAnnotation;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IQualifier;
-import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.common.ui.widget.editor.CheckBoxFieldEditor;
@@ -96,7 +95,7 @@
public void init(IStructuredSelection selection) {
super.init(selection);
- if (!selection.isEmpty()) {
+ if (selection != null && !selection.isEmpty()) {
Object o = selection.iterator().next();
IType type = null;
if (o instanceof IType) {
@@ -118,8 +117,8 @@
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
}
+ ArrayList<String> interfacesNames = new ArrayList<String>();
if (isInterface) {
- ArrayList<String> interfacesNames = new ArrayList<String>();
String name = "";
try {
name = type.getFullyQualifiedParameterizedName();
@@ -127,12 +126,12 @@
name = type.getFullyQualifiedName();
}
interfacesNames.add(name);
- setSuperInterfaces(interfacesNames, true);
- superInterfacesChanged();
setDefaultTypeName(name);
}
+ interfacesNames.add("java.io.Serializable");
+ setSuperInterfaces(interfacesNames, true);
+ superInterfacesChanged();
}
- setModifiers(getModifiers() | Flags.AccAbstract, true);
doStatusUpdate();
}
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r29483 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-03 17:14:09 -0500 (Thu, 03 Mar 2011)
New Revision: 29483
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
Log:
JBIDE-8515
https://issues.jboss.org/browse/JBIDE-8515
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java 2011-03-03 21:37:07 UTC (rev 29482)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java 2011-03-03 22:14:09 UTC (rev 29483)
@@ -126,8 +126,8 @@
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
}
+ ArrayList<String> interfacesNames = new ArrayList<String>();
if (isInterface) {
- ArrayList<String> interfacesNames = new ArrayList<String>();
String name = "";
try {
name = type.getFullyQualifiedParameterizedName();
@@ -135,12 +135,12 @@
name = type.getFullyQualifiedName();
}
interfacesNames.add(name);
- setSuperInterfaces(interfacesNames, true);
- superInterfacesChanged();
setDefaultTypeName(name);
}
+ interfacesNames.add("java.io.Serializable");
+ setSuperInterfaces(interfacesNames, true);
+ superInterfacesChanged();
}
- setModifiers(getModifiers() | Flags.AccAbstract, true);
doStatusUpdate();
}
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r29482 - in trunk: common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-03-03 16:37:07 -0500 (Thu, 03 Mar 2011)
New Revision: 29482
Added:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java
Removed:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesBundleHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesJSPBundleHyperlinkPartitioner.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfBundleHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPBundleHyperlinkPartitioner.java
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesJSPLoadBundleHyperlinkPartitioner.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesLoadBundleHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/resources.properties
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java
Log:
JBIDE-8281
OpenOn doesn't work for #{msgs.prompt} in JSF2 project.
Issue is fixed
JUnit test is added
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -29,6 +29,11 @@
IResource getMessageBundleResource();
/**
+ * @return true if the segment presents message bundle. In this case isProperty() always returns false;
+ */
+ boolean isBundle();
+
+ /**
* @return true if the segment presents message property.
*/
boolean isProperty();
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -23,6 +23,7 @@
private ITextSourceReference messagePropertySourceReference = null;
private int propertyStart=0, propertyLength=0;
private String baseName=null;
+ private boolean isBundle = false;
public IResource getMessageBundleResource() {
return messageBundleResource;
@@ -32,8 +33,16 @@
messageBundleResource = resource;
}
+ public void setBundleOnlySegment(boolean set) {
+ isBundle = set;
+ }
+
+ public boolean isBundle() {
+ return isBundle;
+ }
+
public boolean isProperty() {
- return messagePropertySourceReference != null;
+ return !isBundle && (messagePropertySourceReference != null);
}
public ITextSourceReference getMessagePropertySourceReference() {
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -31,6 +31,7 @@
* @author Jeremy
*/
public abstract class XModelBasedHyperlink extends AbstractHyperlink {
+ protected Properties requestProperties = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion)
@@ -45,15 +46,15 @@
IPromptingProvider provider = PromptingProviderFactory.WEB;
- Properties p = getRequestProperties(region);
- p.put(IPromptingProvider.FILE, documentFile);
+ requestProperties = getRequestProperties(region);
+ requestProperties.put(IPromptingProvider.FILE, documentFile);
- List list = provider.getList(xModel, getRequestMethod(), p.getProperty("prefix"), p); //$NON-NLS-1$
+ List list = provider.getList(xModel, getRequestMethod(), requestProperties.getProperty("prefix"), requestProperties); //$NON-NLS-1$
if (list != null && list.size() >= 1) {
openFileInEditor((String)list.get(0));
return;
}
- String error = p.getProperty(IPromptingProvider.ERROR);
+ String error = requestProperties.getProperty(IPromptingProvider.ERROR);
if ( error != null && error.length() > 0) {
openFileFailed();
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -19,14 +19,13 @@
import java.util.TreeSet;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.graphics.Image;
-import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
+import org.jboss.tools.common.el.core.model.ELArgumentInvocation;
import org.jboss.tools.common.el.core.model.ELExpression;
import org.jboss.tools.common.el.core.model.ELInstance;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
@@ -49,7 +48,6 @@
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.TextProposal;
-import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.model.helpers.converter.OpenKeyHelper;
@@ -190,6 +188,19 @@
true); // is Final and equal names are because of
// we have no more to resolve the parts of expression,
// but we have to resolve arguments of probably a message component
+ if (resolvedVariables != null && !resolvedVariables.isEmpty()) {
+ resolution.setLastResolvedToken(left);
+
+ ELSegmentImpl segment = new MessagePropertyELSegmentImpl();
+ segment.setToken(left.getFirstToken());
+ processMessageBundleSegment(expr, (MessagePropertyELSegmentImpl)segment, resolvedVariables);
+
+ segment.setResolved(true);
+ for (Variable variable : resolvedVariables) {
+ segment.getVariables().add(variable);
+ }
+ resolution.addSegment(segment);
+ }
} else if (expr.getLeft() == null && isIncomplete) {
resolvedVariables = resolveVariables(file, expr, bundles, true,
returnEqualedVariablesOnly);
@@ -203,8 +214,10 @@
resolvedVariables = resolvedVars;
resolution.setLastResolvedToken(left);
- ELSegmentImpl segment = new ELSegmentImpl();
+ ELSegmentImpl segment = new MessagePropertyELSegmentImpl();
segment.setToken(left.getFirstToken());
+ processMessageBundleSegment(expr, (MessagePropertyELSegmentImpl)segment, resolvedVariables);
+
segment.setResolved(true);
for (Variable variable : resolvedVars) {
segment.getVariables().add(variable);
@@ -226,8 +239,10 @@
resolvedVariables = resolveVariables(file, expr, bundles, true, returnEqualedVariablesOnly);
Set<TextProposal> proposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER);
- ELSegmentImpl segment = new ELSegmentImpl();
- segment.setToken(expr.getFirstToken());
+ ELSegmentImpl segment = new MessagePropertyELSegmentImpl();
+ segment.setToken(left.getFirstToken());
+ processMessageBundleSegment(expr, (MessagePropertyELSegmentImpl)segment, resolvedVariables);
+
segment.setResolved(false);
resolution.addSegment(segment);
@@ -339,7 +354,7 @@
protected void setImage(TextProposal kbProposal) {
kbProposal.setImage(getELProposalImage());
}
-
+
protected void resolveLastSegment(ELInvocationExpression expr,
List<Variable> members,
ELResolutionImpl resolution,
@@ -352,6 +367,10 @@
segment = new MessagePropertyELSegmentImpl();
segment.setToken(((ELPropertyInvocation)expr).getName());
processMessagePropertySegment(expr, (MessagePropertyELSegmentImpl)segment, members);
+ } else if (expr instanceof ELArgumentInvocation) {
+ segment = new MessagePropertyELSegmentImpl();
+ segment.setToken(((ELArgumentInvocation)expr).getArgument().getOpenArgumentToken().getNextToken());
+ processMessagePropertySegment(expr, (MessagePropertyELSegmentImpl)segment, members);
} else {
segment.setToken(expr.getFirstToken());
}
@@ -462,6 +481,30 @@
}
}
+ private void processMessageBundleSegment(ELInvocationExpression expr, MessagePropertyELSegmentImpl segment, List<Variable> variables) {
+ if(segment.getToken() == null)
+ return;
+ for(Variable variable : variables){
+ if(expr.getFirstToken().getText().equals(variable.name)){
+
+ IModelNature n = EclipseResourceUtil.getModelNature(variable.f.getProject());
+ if(n == null)
+ return;
+ XModel model = n.getModel();
+ if(model == null)
+ return;
+
+ OpenKeyHelper keyHelper = new OpenKeyHelper();
+ XModelObject[] properties = keyHelper.findBundles(model, variable.basename, null);
+ if(properties == null)
+ return;
+
+ segment.setBaseName(variable.basename);
+ segment.setBundleOnlySegment(true);
+ }
+ }
+ }
+
private void processMessagePropertySegment(ELInvocationExpression expr, MessagePropertyELSegmentImpl segment, List<Variable> variables){
if(segment.getToken() == null)
return;
@@ -486,7 +529,7 @@
if(propFile == null)
continue;
segment.setMessageBundleResource(propFile);
- XModelObject property = p.getChildByPath(segment.getToken().getText());
+ XModelObject property = p.getChildByPath(trimQuotes(segment.getToken().getText()));
if(property != null){
try {
String content = FileUtil.readStream(propFile);
@@ -502,6 +545,20 @@
}
}
+ private String trimQuotes(String value) {
+ if(value == null)
+ return null;
+
+ if(value.startsWith("'") || value.startsWith("\"")) { //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.substring(1);
+ }
+
+ if(value.endsWith("'") || value.endsWith("\"")) { //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.substring(0, value.length() - 1);
+ }
+ return value;
+ }
+
public boolean findPropertyLocation(XModelObject property, String content, MessagePropertyELSegmentImpl segment) {
String name = property.getAttributeValue("name"); //$NON-NLS-1$
String nvs = property.getAttributeValue("name-value-separator"); //$NON-NLS-1$
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2011-03-03 21:37:07 UTC (rev 29482)
@@ -792,8 +792,18 @@
<contentType id="org.eclipse.jst.jsp.core.jspsource">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
+ <!-- these CTs were copied from the JsfJSPBundleHyperlinkPartitioner -->
+ <contentType id="org.eclipse.wst.html.core.htmlsource">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+ </contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+ </contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+ </contentType>
</hyperlinkPartitioner>
- <hyperlinkPartitioner
+ <!-- hyperlinkPartitioner
id="org.jboss.tools.common.text.ext.jsf.hyperlink.JsfJSPBundleHyperlinkPartitioner"
class="org.jboss.tools.jsf.text.ext.hyperlink.JsfJSPBundleHyperlinkPartitioner">
<contentType id="org.eclipse.wst.html.core.htmlsource">
@@ -805,7 +815,7 @@
<contentType id="jsf.facelet.composite">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
- </hyperlinkPartitioner>
+ </hyperlinkPartitioner -->
<hyperlinkPartitioner
id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPClassHyperlinkPartitioner"
@@ -1066,8 +1076,18 @@
<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
+ </contenttypeidentifier>
</hyperlink>
- <hyperlink
+
+ <!-- hyperlink
class="org.jboss.tools.jsf.text.ext.hyperlink.JsfBundleHyperlink"
id="org.jboss.tools.common.text.ext.jsf.hyperlink.JsfBundleHyperlink">
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
@@ -1079,7 +1099,7 @@
<contenttypeidentifier id="jsf.facelet.composite">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
</contenttypeidentifier>
- </hyperlink>
+ </hyperlink -->
<hyperlink
class="org.jboss.tools.jsf.text.ext.hyperlink.BundleBasenameHyperlink"
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,163 +1,42 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
import java.util.Properties;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.ui.IEditorPart;
-import org.jboss.tools.common.model.XModel;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.jboss.tools.common.el.core.model.ELInvocationExpression;
+import org.jboss.tools.common.el.core.resolver.ELContext;
+import org.jboss.tools.common.el.core.resolver.ELResolution;
+import org.jboss.tools.common.el.core.resolver.ELResolver;
+import org.jboss.tools.common.el.core.resolver.ELSegment;
+import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegment;
import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
+import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner.ExpressionStructure;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
-import org.jboss.tools.jst.web.tld.TaglibData;
-import org.jboss.tools.jst.web.tld.VpeTaglibManager;
-import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* @author Jeremy
*/
public class BundleHyperlink extends XModelBasedHyperlink {
-
- private String getBundleProperty(IRegion region) {
- if(getDocument() == null) return null;
- try {
- String fullText = getDocument().get(region.getOffset(), region.getLength());
-
- // get var name
- int dotIndex = fullText.indexOf("."); //$NON-NLS-1$
- int bracketIndex = fullText.indexOf("["); //$NON-NLS-1$
-
- boolean useDot = false;
- boolean useBracket = false;
-
- if (dotIndex != -1) useDot = true;
- if (bracketIndex != -1) {
- if (!useDot || (useDot && dotIndex > bracketIndex))
- useBracket = true;
- useDot = false;
- }
- if (useDot && fullText.indexOf(".", dotIndex + 1) != -1) //$NON-NLS-1$
- useDot = false;
-
- if (!useDot && !useBracket) return null;
-
- String sProp = null;
- if (useDot) {
- sProp = fullText.substring(dotIndex + 1);
- }
- if (useBracket) {
- int startProp = bracketIndex + 1;
- int endProp = fullText.indexOf("]"); //$NON-NLS-1$
- if (endProp == -1) endProp = fullText.length() - 1;
- sProp = Utils.trimQuotes(fullText.substring(startProp, endProp));
- }
- return sProp;
- } catch (BadLocationException x) {
- JSFExtensionsPlugin.log("", x); //$NON-NLS-1$
- return null;
- }
-
- }
- private String getBundleBasename(IRegion region) {
- StructuredModelWrapper smw = new StructuredModelWrapper();
- smw.init(getDocument());
- try {
- Document xmlDocument = smw.getDocument();
- if (xmlDocument == null) return null;
-
- String bundleProp = getDocument().get(region.getOffset(), region.getLength());
-
- String[] prefixes = getLoadBundleTagPrefixes(region);
- if(prefixes == null) return null;
-
- // Find loadBundle tag
- List<Element> lbTags = new ArrayList<Element>();
- for (String prefix : prefixes) {
- NodeList list = xmlDocument.getElementsByTagName(prefix + ":loadBundle"); //$NON-NLS-1$
- for (int i = 0; list != null && i < list.getLength(); i++) {
- Element el = (Element)list.item(i);
- int end = Utils.getValueEnd(el);
- if (end >= 0 && end < region.getOffset()) {
- lbTags.add(el);
- }
- }
- }
- for (int i = 0; i < lbTags.size(); i++) {
- Element el = (Element)lbTags.get(i);
- Attr var = el.getAttributeNode("var"); //$NON-NLS-1$
- if (bundleProp.startsWith("" + var.getValue() + ".") //$NON-NLS-1$ //$NON-NLS-2$
- || bundleProp.startsWith("" + var.getValue() + "['") //$NON-NLS-1$ //$NON-NLS-2$
- || bundleProp.equals(var.getValue())) {
- return ((Attr) el.getAttributeNode("basename")).getNodeValue(); //$NON-NLS-1$
- }
- }
- String bundleVar = bundleProp;
- if(bundleVar.indexOf('.') >= 0) bundleVar = bundleVar.substring(0, bundleVar.indexOf('.'));
- if(bundleVar.indexOf("['") >= 0) bundleVar = bundleVar.substring(0, bundleVar.indexOf("['")); //$NON-NLS-1$ //$NON-NLS-2$
- XModel xmodel = smw.getXModel();
- List list2 = WebPromptingProvider.getInstance().getList(xmodel, WebPromptingProvider.JSF_REGISTERED_BUNDLES, null, new Properties());
- if(list2 == null || list2.size() < 1) return null;
- Map map = (Map)list2.get(0);
- return (String)map.get(bundleVar);
- } catch (BadLocationException x) {
- JSFExtensionsPlugin.log("", x); //$NON-NLS-1$
- return null;
- } finally {
- smw.dispose();
- }
- }
-
- protected String[] getLoadBundleTagPrefixes(IRegion region) {
- TaglibManagerWrapper tmw = new TaglibManagerWrapper();
- tmw.init(getDocument(), region.getOffset());
- if(tmw.exists()) {
- return new String[] { tmw.getCorePrefix() };
- } else {
- VpeTaglibManager taglibManager = getTaglibManager();
- if(taglibManager == null) return null;
- TaglibData[] data = (TaglibData[])taglibManager.getTagLibs().toArray(new TaglibData[0]);
- ArrayList<String> prefixes = new ArrayList<String>();
- for (int i = 0; i < data.length; i++) {
- if("http://java.sun.com/jsf/core".equals(data[i].getUri())) //$NON-NLS-1$
- prefixes.add(data[i].getPrefix());
- }
- }
- return null;
- }
-
- private VpeTaglibManager getTaglibManager() {
- IEditorPart editor = JSFExtensionsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editor instanceof VpeTaglibManagerProvider) {
- return ((VpeTaglibManagerProvider)editor).getTaglibManager();
- }
- return null;
- }
-
private static final String VIEW_TAGNAME = "view"; //$NON-NLS-1$
private static final String LOCALE_ATTRNAME = "locale"; //$NON-NLS-1$
private static final String PREFIX_SEPARATOR = ":"; //$NON-NLS-1$
@@ -171,26 +50,21 @@
Document xmlDocument = smw.getDocument();
if (xmlDocument == null) return null;
- String[] prefixes = getLoadBundleTagPrefixes(region);
- if(prefixes == null) return null;
-
Node n = Utils.findNodeForOffset(xmlDocument, region.getOffset());
if (!(n instanceof Attr) ) return null;
Element el = ((Attr)n).getOwnerElement();
Element jsfCoreViewTag = null;
- for (String prefix : prefixes) {
- String nodeToFind = prefix + PREFIX_SEPARATOR + VIEW_TAGNAME;
+ String nodeToFind = PREFIX_SEPARATOR + VIEW_TAGNAME;
- while (el != null) {
- if (nodeToFind.equals(el.getNodeName())) {
- jsfCoreViewTag = el;
- break;
- }
- Node parent = el.getParentNode();
- el = (parent instanceof Element ? (Element)parent : null);
+ while (el != null) {
+ if (el.getNodeName() != null && el.getNodeName().endsWith(nodeToFind)) {
+ jsfCoreViewTag = el;
+ break;
}
+ Node parent = el.getParentNode();
+ el = (parent instanceof Element ? (Element)parent : null);
}
if (jsfCoreViewTag == null || !jsfCoreViewTag.hasAttribute(LOCALE_ATTRNAME)) return null;
@@ -214,37 +88,76 @@
}
protected String getRequestMethod() {
- return WebPromptingProvider.JSF_OPEN_KEY;
+ return requestProperties != null && requestProperties.getProperty(WebPromptingProvider.KEY) == null ?
+ WebPromptingProvider.JSF_OPEN_BUNDLE : WebPromptingProvider.JSF_OPEN_KEY;
}
protected Properties getRequestProperties(IRegion region) {
- Properties p = new Properties();
- String value = getBundleBasename(region);
- if (value != null) {
- p.put(WebPromptingProvider.BUNDLE, value);
+ ELContext context = JSPExprHyperlinkPartitioner.getELContext(getDocument());
+ if(context != null){
+ ExpressionStructure eStructure = JSPExprHyperlinkPartitioner.getExpression(context, getOffset());
+ if(eStructure != null){
+ ELInvocationExpression invocationExpression = JSPExprHyperlinkPartitioner.getInvocationExpression(eStructure.reference, eStructure.expression, getOffset());
+ if(invocationExpression != null){
+ for(ELResolver resolver : context.getElResolvers()){
+ ELResolution resolution = resolver.resolve(context, invocationExpression, getOffset());
+ if(resolution==null) {
+ continue;
+ }
+ ELSegment segment = resolution.findSegmentByOffset(getOffset()-eStructure.reference.getStartPosition());
+
+ if (segment != null && segment.isResolved() && segment instanceof MessagePropertyELSegment) {
+ MessagePropertyELSegment mpSegment = (MessagePropertyELSegment)segment;
+ String bundleBasename = mpSegment.getBaseName();
+ String property = mpSegment.isBundle() ? null : trimQuotes(mpSegment.getToken().getText());
+ String locale = getPageLocale(region);
+
+ Properties p = new Properties();
+ if (bundleBasename != null) {
+ p.put(WebPromptingProvider.BUNDLE, bundleBasename);
+ }
+
+ if (property != null) {
+ p.put(WebPromptingProvider.KEY, property);
+ }
+
+ if (locale != null) {
+ p.setProperty(WebPromptingProvider.LOCALE, locale);
+ }
+
+ return p;
+ }
+ }
+ }
+ }
}
+ return null;
+ }
+
+ private String trimQuotes(String value) {
+ if(value == null)
+ return null;
+
+ if(value.startsWith("'") || value.startsWith("\"")) { //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.substring(1);
+ }
- value = getBundleProperty(region);
- if (value != null) {
- p.put(WebPromptingProvider.KEY, value);
+ if(value.endsWith("'") || value.endsWith("\"")) { //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.substring(0, value.length() - 1);
}
-
- value = getPageLocale(region);
- if (value != null) {
- p.setProperty(WebPromptingProvider.LOCALE, value);
- }
+ return value;
+ }
- return p;
- }
- /*
- * (non-Javadoc)
+ /**
+ * Returns the text to be shown for Open action
*
* @see IHyperlink#getHyperlinkText()
*/
public String getHyperlinkText() {
- String baseName = getBundleBasename(fLastRegion);
- String propertyName = getBundleProperty(fLastRegion);
+ Properties p = getRequestProperties(fLastRegion);
+ String baseName = p == null ? null : p.getProperty(WebPromptingProvider.BUNDLE);
+ String propertyName = p == null ? null : p.getProperty(WebPromptingProvider.KEY);
if (baseName == null || propertyName == null)
return MessageFormat.format(Messages.OpenA, Messages.BundleProperty);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,36 +1,33 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
+import org.jboss.tools.common.el.core.model.ELExpression;
+import org.jboss.tools.common.el.core.model.ELInvocationExpression;
+import org.jboss.tools.common.el.core.resolver.ELContext;
+import org.jboss.tools.common.el.core.resolver.ELResolution;
+import org.jboss.tools.common.el.core.resolver.ELResolver;
+import org.jboss.tools.common.el.core.resolver.ELSegment;
+import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegment;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitioner;
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecognizer;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner.ExpressionStructure;
import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
-import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
+import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
+import org.w3c.dom.Document;
/**
* @author Jeremy
@@ -76,61 +73,39 @@
}
return superRegion.getAxis();
}
-
+
public static IHyperlinkRegion getRegion(IDocument document, final int offset) {
- StructuredModelWrapper smw = new StructuredModelWrapper();
- smw.init(document);
- try {
- Document xmlDocument = smw.getDocument();
- if (xmlDocument == null) return null;
-
- Node n = Utils.findNodeForOffset(xmlDocument, offset);
-
- if (n == null || !(n instanceof Attr || n instanceof Text)) return null;
-
- int start = Utils.getValueStart(n);
- int end = Utils.getValueEnd(n);
- if(start < 0 || start > end || start > offset) return null;
- String attrText = document.get(start, end - start);
-
- StringBuffer sb = new StringBuffer(attrText);
- //find start of bean property
- int bStart = offset - start;
- while (bStart >= 0) {
- if (!Character.isJavaIdentifierPart(sb.charAt(bStart)) &&
- sb.charAt(bStart) != '.' && sb.charAt(bStart) != '[' && sb.charAt(bStart) != ']' &&
- sb.charAt(bStart) != '\'') {
- bStart++;
- break;
+ ELContext context = JSPExprHyperlinkPartitioner.getELContext(document);
+ if(context != null){
+ ExpressionStructure eStructure = JSPExprHyperlinkPartitioner.getExpression(context, offset);
+ if(eStructure != null){
+ ELInvocationExpression invocationExpression = JSPExprHyperlinkPartitioner.getInvocationExpression(eStructure.reference, eStructure.expression, offset);
+ if(invocationExpression != null){
+ ELSegment segment = decide(context, eStructure.expression, invocationExpression, offset-eStructure.reference.getStartPosition(), offset);
+ if (segment != null) {
+ IHyperlinkRegion region = new HyperlinkRegion(eStructure.reference.getStartPosition() + segment.getSourceReference().getStartPosition(), segment.getSourceReference().getLength(), null, null, null);
+ return region;
+ }
}
-
- if (bStart == 0) break;
- bStart--;
}
- // find end of bean property
- int bEnd = offset - start;
- while (bEnd < sb.length()) {
- if (!Character.isJavaIdentifierPart(sb.charAt(bEnd)) &&
- sb.charAt(bEnd) != '.' && sb.charAt(bEnd) != '[' && sb.charAt(bEnd) != ']' &&
- sb.charAt(bEnd) != '\'')
- break;
- bEnd++;
+ }
+ return null;
+ }
+
+ private static ELSegment decide(ELContext context, ELExpression expression, ELInvocationExpression invocationExpression, int offset, int globalOffset){
+ for(ELResolver resolver : context.getElResolvers()){
+ ELResolution resolution = resolver.resolve(context, invocationExpression, globalOffset);
+ if(resolution==null) {
+ continue;
}
-
- int propStart = bStart + start;
- int propLength = bEnd - bStart;
-
- if (propStart > offset || propStart + propLength < offset) return null;
-
- IHyperlinkRegion region = new HyperlinkRegion(propStart, propLength, null, null, null);
- return region;
- } catch (BadLocationException x) {
- JSFExtensionsPlugin.log("", x); //$NON-NLS-1$
- return null;
- } finally {
- smw.dispose();
+ ELSegment segment = resolution.findSegmentByOffset(offset);
+ if(segment != null && segment.isResolved()){
+ if (segment != null && segment.isResolved() && segment instanceof MessagePropertyELSegment) {
+ return segment;
+ }
+ }
}
-
+ return null;
}
/**
@@ -145,81 +120,15 @@
Utils.findNodeForOffset(xmlDocument, region.getOffset());
- IHyperlinkRegion r = getRegion(document, region.getOffset());
- if (r == null) return false;
-
- String bundleProp = document.get(r.getOffset(), r.getLength());
-
- // get var name
- int dotIndex = bundleProp.indexOf("."); //$NON-NLS-1$
- int bracketIndex = bundleProp.indexOf("["); //$NON-NLS-1$
-
- boolean useDot = false;
- boolean useBracket = false;
-
- if (dotIndex != -1) useDot = true;
- if (bracketIndex != -1) {
- if (!useDot || (useDot && dotIndex > bracketIndex))
- useBracket = true;
- }
- if (useDot && bundleProp.indexOf(".", dotIndex + 1) != -1) //$NON-NLS-1$
- useDot = false;
-
- if (!useDot && !useBracket) return false;
-
- String sVar = null;
- String sProp = null;
- if (useDot) {
- sVar = bundleProp.substring(0, dotIndex);
- sProp = bundleProp.substring(dotIndex + 1);
- }
- if (useBracket) {
- sVar = bundleProp.substring(0, bracketIndex);
- int startProp = bracketIndex + 1;
- int endProp = bundleProp.indexOf("]"); //$NON-NLS-1$
- if (endProp == -1) endProp = bundleProp.length() - 1;
- sProp = Utils.trimQuotes(bundleProp.substring(startProp, endProp));
- }
-
-
- if (sVar == null || sProp == null) return false;
-
- String[] prefixes = getLoadBundleTagPrefixes(document, region.getOffset());
- if (prefixes == null) return false;
-
- for (String prefix : prefixes) {
- // Find loadBundle tag
- List<Element> lbTags = new ArrayList<Element>();
- NodeList list = xmlDocument.getElementsByTagName(prefix + ":loadBundle"); //$NON-NLS-1$
- for (int i = 0; list != null && i < list.getLength(); i++) {
- Element el = (Element)list.item(i);
- int end = Utils.getValueEnd(el);
- if (end >= 0 && end < region.getOffset()) {
- lbTags.add(el);
- }
- }
-
- Element lbTag = null;
- for (int i = 0; i < lbTags.size(); i++) {
- Element el = lbTags.get(i);
- Attr var = el.getAttributeNode("var"); //$NON-NLS-1$
-
- if (sVar.equals(var.getValue())) {
- lbTag = el;
- break;
- }
- }
- if (lbTag != null) return true;
- }
- return false;
- } catch (BadLocationException x) {
- JSFExtensionsPlugin.log("", x); //$NON-NLS-1$
- return false;
+ return (getRegion(document, region.getOffset()) != null);
} finally {
smw.dispose();
}
}
+ /**
+ * @deprecated
+ */
protected String[] getLoadBundleTagPrefixes(IDocument document, int offset) {
TaglibManagerWrapper tmw = new TaglibManagerWrapper();
tmw.init(document, offset);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,12 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
@@ -21,6 +21,7 @@
import org.jboss.tools.common.el.core.resolver.ELResolver;
import org.jboss.tools.common.el.core.resolver.ELSegment;
import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
+import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegment;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitioner;
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion;
import org.jboss.tools.common.text.ext.hyperlink.IExclusiblePartitionerRecognition;
@@ -91,14 +92,14 @@
if(invocationExpression != null){
jspExpression = decide(context, eStructure.expression, invocationExpression, offset-eStructure.reference.getStartPosition(), offset);
if(jspExpression){
- IHyperlinkRegion region = new HyperlinkRegion(invocationExpression.getStartPosition(), invocationExpression.getLength(), null, null, null);
+ IHyperlinkRegion region = new HyperlinkRegion(eStructure.reference.getStartPosition() + invocationExpression.getStartPosition(), invocationExpression.getLength(), null, null, null);
return region;
}
+ dotExpression = checkDot(document, offset, context, eStructure.expression, invocationExpression, offset-eStructure.reference.getStartPosition());
+
+ IHyperlinkRegion region = new HyperlinkRegion(eStructure.reference.getStartPosition() + invocationExpression.getStartPosition(), eStructure.expression.getLength(), null, null, null);
+ return region;
}
- dotExpression = checkDot(document, offset, context, eStructure.expression, invocationExpression, offset-eStructure.reference.getStartPosition());
-
- IHyperlinkRegion region = new HyperlinkRegion(eStructure.expression.getStartPosition(), eStructure.expression.getLength(), null, null, null);
- return region;
}
}
return null;
@@ -154,6 +155,9 @@
return true;
}
}
+ if (segment instanceof MessagePropertyELSegment) {
+ return false;
+ }
}
}
return false;
Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfBundleHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfBundleHyperlink.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfBundleHyperlink.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.jsf.text.ext.hyperlink;
-
-import org.eclipse.jface.text.IRegion;
-
-/**
- *
- * @author Jeremy
- *
- */
-public class JsfBundleHyperlink extends BundleHyperlink {
-
- @Override
- protected String[] getLoadBundleTagPrefixes(IRegion region) {
- return JsfJSPBundleHyperlinkPartitioner.getLoadBundleTagPrefixes(getDocument(), region);
- }
-
-}
Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPBundleHyperlinkPartitioner.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPBundleHyperlinkPartitioner.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPBundleHyperlinkPartitioner.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.jsf.text.ext.hyperlink;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.jboss.tools.common.text.ext.util.Utils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- *
- * @author Jeremy
- *
- */
-public class JsfJSPBundleHyperlinkPartitioner extends JSPBundleHyperlinkPartitioner {
-
- private static final String JSF_CORE_URI = "http://java.sun.com/jsf/core"; //$NON-NLS-1$
-
- protected String[] getLoadBundleTagPrefixes(IDocument document, int offset) {
- return getLoadBundleTagPrefixes(document, new Region(offset, 0));
- }
-
- static String[] getLoadBundleTagPrefixes(IDocument document, IRegion region) {
- Map<String, Set<String>> namespaces = getNameSpaces(document, region.getOffset());
-
- if (namespaces == null)
- return null;
-
- Set<String> prefixes = namespaces.get(JSF_CORE_URI);
- if (prefixes == null)
- return null;
-
- return prefixes.toArray(new String[prefixes.size()]);
- }
-
- /**
- * Method collects the namespaces used in the document
- *
- * @param document
- * @param offset
- * @return
- */
- static public Map<String, Set<String>> getNameSpaces(IDocument document, int offset) {
- IStructuredModel sModel = StructuredModelManager
- .getModelManager()
- .getExistingModelForRead(document);
-
- try {
- if (sModel == null)
- return null;
-
- Document xmlDocument = (sModel instanceof IDOMModel) ? ((IDOMModel) sModel)
- .getDocument()
- : null;
-
- if (xmlDocument == null)
- return null;
-
- Map<String, Set<String>> namespaces = new HashMap<String,Set<String>>();
- Node n = Utils.findNodeForOffset(xmlDocument, offset);
- while (n != null) {
- if (!(n instanceof Element)) {
- if (n instanceof Attr) {
- n = ((Attr) n).getOwnerElement();
- } else {
- n = n.getParentNode();
- }
- continue;
- }
-
- NamedNodeMap attrs = n.getAttributes();
- for (int j = 0; attrs != null && j < attrs.getLength(); j++) {
- Attr a = (Attr) attrs.item(j);
- String name = a.getName();
- if (name.startsWith("xmlns:")) { //$NON-NLS-1$
- final String prefix = name.substring("xmlns:".length()); //$NON-NLS-1$
- final String uri = a.getValue();
- if (prefix != null && prefix.trim().length() > 0 &&
- uri != null && uri.trim().length() > 0) {
-
- Set<String> prefixes = namespaces.get(uri.trim());
- if (prefixes == null) {
- prefixes = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
- namespaces.put(uri.trim(), prefixes);
- }
- prefixes.add(prefix.trim());
- }
- }
- }
-
- n = n.getParentNode();
- }
-
- return namespaces;
- } finally {
- if (sModel != null) {
- sModel.releaseFromRead();
- }
- }
- }
-}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2011-03-03 21:37:07 UTC (rev 29482)
@@ -343,7 +343,7 @@
</hyperlinkPartitioner>
- <hyperlinkPartitioner
+ <!-- hyperlinkPartitioner
id="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.RichfacesJSPBundleHyperlinkPartitioner"
class="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.RichfacesJSPBundleHyperlinkPartitioner">
<contentType id="org.eclipse.jst.jsp.core.jspsource">
@@ -362,7 +362,7 @@
<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
- </hyperlinkPartitioner>
+ </hyperlinkPartitioner -->
<hyperlinkPartitioner
id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPForIDHyperlinkPartitioner"
@@ -1007,7 +1007,7 @@
</contenttypeidentifier>
</hyperlink>
- <hyperlink
+ <!-- hyperlink
class="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.RichfacesBundleHyperlink"
id="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.RichfacesBundleHyperlink">
<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
@@ -1022,7 +1022,7 @@
<contenttypeidentifier id="jsf.facelet.composite">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_BUNDLE" />
</contenttypeidentifier>
- </hyperlink>
+ </hyperlink -->
</extension>
Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesBundleHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesBundleHyperlink.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesBundleHyperlink.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.jsf.text.ext.richfaces.hyperlink;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.ui.IEditorPart;
-import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
-import org.jboss.tools.jsf.text.ext.hyperlink.BundleHyperlink;
-import org.jboss.tools.jsf.text.ext.richfaces.RichfacesExtensionsPlugin;
-import org.jboss.tools.jst.web.tld.TaglibData;
-import org.jboss.tools.jst.web.tld.VpeTaglibManager;
-import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider;
-
-/**
- *
- * @author Victor Rubezhny
- *
- */
-public class RichfacesBundleHyperlink extends BundleHyperlink {
-
- protected String[] getLoadBundleTagPrefixes(IRegion region) {
- ArrayList<String> prefixes = new ArrayList<String>();
- TaglibManagerWrapper tmw = new TaglibManagerWrapper();
- tmw.init(getDocument(), region.getOffset());
- if(tmw.exists()) {
- for (String uri : RichfacesJSPBundleHyperlinkPartitioner.LoadBundleURIs) {
- String prefix = tmw.getPrefix(uri);
- if (prefix != null)
- prefixes.add(prefix);
- }
- } else {
- VpeTaglibManager taglibManager = getTaglibManager();
- if(taglibManager == null) return null;
- TaglibData[] data = (TaglibData[])taglibManager.getTagLibs().toArray(new TaglibData[0]);
- for (int i = 0; i < data.length; i++) {
- for (String uri : RichfacesJSPBundleHyperlinkPartitioner.LoadBundleURIs) {
- if(uri.equals(data[i].getUri()))
- prefixes.add(data[i].getPrefix());
- }
- }
- }
- return (String[])prefixes.toArray(new String[prefixes.size()]);
- }
-
- private VpeTaglibManager getTaglibManager() {
- IEditorPart editor = RichfacesExtensionsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editor instanceof VpeTaglibManagerProvider) {
- return ((VpeTaglibManagerProvider)editor).getTaglibManager();
- }
- return null;
- }
-
-}
Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesJSPBundleHyperlinkPartitioner.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesJSPBundleHyperlinkPartitioner.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesJSPBundleHyperlinkPartitioner.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.jsf.text.ext.richfaces.hyperlink;
-
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jface.text.IDocument;
-import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
-import org.jboss.tools.jsf.text.ext.hyperlink.JSPBundleHyperlinkPartitioner;
-import org.jboss.tools.jsf.text.ext.hyperlink.JsfJSPBundleHyperlinkPartitioner;
-
-/**
- *
- * @author Victor Rubezhny
- *
- */
-public class RichfacesJSPBundleHyperlinkPartitioner extends JSPBundleHyperlinkPartitioner {
- public static final String JSP_RICHFACES_BUNDLE_PARTITION = "org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_BUNDLE"; //$NON-NLS-1$
-
- public final static String[] LoadBundleURIs = {
- "http://richfaces.org/a4j", //$NON-NLS-1$
- "https://ajax4jsf.dev.java.net/ajax" //$NON-NLS-1$
- };
-
- /**
- * @Override
- */
- protected String getPartitionType() {
- return JSP_RICHFACES_BUNDLE_PARTITION;
- }
-
- /**
- * @Override
- */
- protected String[] getLoadBundleTagPrefixes(IDocument document, int offset) {
- ArrayList<String> prefixes = new ArrayList<String>();
- TaglibManagerWrapper tmw = new TaglibManagerWrapper();
- tmw.init(document, offset);
- if(tmw.exists()) {
- for (String uri : LoadBundleURIs) {
- String prefix = tmw.getPrefix(uri);
- if (prefix != null)
- prefixes.add(prefix);
- }
- }
- // JBIDE-4559: For XHTML pages we should use alternate way to get the prefixes
- Map<String, Set<String>> namespaces = JsfJSPBundleHyperlinkPartitioner.getNameSpaces(document, offset);
-
- if (namespaces != null) {
- for (String uri : LoadBundleURIs) {
- Set<String> altPrefixes = namespaces.get(uri);
- if (altPrefixes != null)
- prefixes.addAll(altPrefixes);
- }
- }
-
- return (prefixes.size() == 0 ? null : (String[])prefixes.toArray(new String[prefixes.size()]));
- }
-
-}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesJSPLoadBundleHyperlinkPartitioner.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesJSPLoadBundleHyperlinkPartitioner.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesJSPLoadBundleHyperlinkPartitioner.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,12 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2009 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jsf.text.ext.richfaces.hyperlink;
@@ -27,6 +27,11 @@
public static final String JSP_RICHFACES_LOADBUNDLE_PARTITION = "org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE"; //$NON-NLS-1$
+ public final static String[] LoadBundleURIs = {
+ "http://richfaces.org/a4j", //$NON-NLS-1$
+ "https://ajax4jsf.dev.java.net/ajax" //$NON-NLS-1$ // @deprecated URI
+ };
+
/**
* @Override
*/
@@ -43,7 +48,7 @@
if(!tmw.exists()) return null;
ArrayList<String> prefixes = new ArrayList<String>();
- for (String uri : RichfacesJSPBundleHyperlinkPartitioner.LoadBundleURIs) {
+ for (String uri : LoadBundleURIs) {
String prefix = tmw.getPrefix(uri);
if (prefix != null)
prefixes.add(prefix);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesLoadBundleHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesLoadBundleHyperlink.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesLoadBundleHyperlink.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,12 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2009 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jsf.text.ext.richfaces.hyperlink;
@@ -34,7 +34,7 @@
TaglibManagerWrapper tmw = new TaglibManagerWrapper();
tmw.init(getDocument(), region.getOffset());
if(tmw.exists()) {
- for (String uri : RichfacesJSPBundleHyperlinkPartitioner.LoadBundleURIs) {
+ for (String uri : RichfacesJSPLoadBundleHyperlinkPartitioner.LoadBundleURIs) {
String prefix = tmw.getPrefix(uri);
if (prefix != null)
prefixes.add(prefix);
@@ -44,7 +44,7 @@
if(taglibManager == null) return null;
TaglibData[] data = (TaglibData[])taglibManager.getTagLibs().toArray(new TaglibData[0]);
for (int i = 0; i < data.length; i++) {
- for (String uri : RichfacesJSPBundleHyperlinkPartitioner.LoadBundleURIs) {
+ for (String uri : RichfacesJSPLoadBundleHyperlinkPartitioner.LoadBundleURIs) {
if(uri.equals(data[i].getUri()))
prefixes.add(data[i].getPrefix());
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/resources.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/resources.properties 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/resources.properties 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,2 +1,3 @@
prompt=Your Name\:
greeting=Hello
+demo.long.named.property=A Long Named Property
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/WEB-INF/faces-config.xml 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/WEB-INF/faces-config.xml 2011-03-03 21:37:07 UTC (rev 29482)
@@ -21,6 +21,10 @@
<application>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
<locale-config/>
+ <resource-bundle>
+ <base-name>resources</base-name>
+ <var>registeredMsgs</var>
+ </resource-bundle>
</application>
<factory/>
<lifecycle/>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname.xhtml 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname.xhtml 2011-03-03 21:37:07 UTC (rev 29482)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:ez="http://java.sun.com/jsf/composite/demo">
-<f:loadBundle basename="resources" var="msg" />
+<f:loadBundle basename="resources" var="pageMsgs" />
<ui:composition template="/templates/common.xhtml"
xmlns:jar="http://java.sun.com/jsf/composite/jarPage"
@@ -17,7 +17,10 @@
<ui:define name="pageHeader">Facelets Hello Application</ui:define>
<ui:define name="body">
- <ez:input id="inputname" label="${msgs.prompt}" value="#{user.name}" action="#{user.sayHello}" submitlabel="Say Hello"/>
+ <ez:input id="inputname" label="${registeredMsgs.prompt}" value="#{user.name}" action="#{user.sayHello}" submitlabel="Say Hello"/>
+ <h:outputText value="${registeredMsgs['demo.long.named.property']}" />
+ <h:outputText value="${pageMsgs.prompt}" />
+ <h:outputText value="${pageMsgs['demo.long.named.property']}" />
<form>
<jar:echo1 echo="Hello" />
<jar:echo echo="Hello" />
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * Copyright (c) 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.jsf.text.ext.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.WorkbenchUtils;
+
+/**
+ *
+ * @author jeremy
+ *
+ */
+public class JSF2MessagesOpenOnTest extends TestCase {
+ private static final String PROJECT_NAME = "JSF2CompositeOpenOn";
+ private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/pages/inputname.xhtml";
+
+ public IProject project = null;
+
+ protected void setUp() {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(
+ PROJECT_NAME);
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+ JobUtils.waitForIdle();
+ }
+
+ protected void tearDown() {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+ }
+
+ public JSF2MessagesOpenOnTest() {
+ super("JSF2 OpenOn on messages test");
+ }
+
+ public void testRegisteredBundle() throws PartInitException, BadLocationException {
+ doTextBundlePropertyOpenOn("resources.properties", "registeredMsgs.prompt", "registeredMsgs");
+ }
+ public void testRegisteredBundleProperty() throws PartInitException, BadLocationException {
+ doTextBundlePropertyOpenOn("resources.properties", "registeredMsgs.prompt", "prompt");
+ }
+ public void testRegisteredLongNamedBundleProperty() throws PartInitException, BadLocationException {
+ doTextBundlePropertyOpenOn("resources.properties", "registeredMsgs['demo.long.named.property']", "demo.long.named.property");
+ }
+ public void testPageLoadedBundle() throws PartInitException, BadLocationException {
+ doTextBundlePropertyOpenOn("resources.properties", "pageMsgs.prompt", "pageMsgs");
+ }
+ public void testPageLoadedBundleProperty() throws PartInitException, BadLocationException {
+ doTextBundlePropertyOpenOn("resources.properties", "pageMsgs.prompt", "prompt");
+ }
+ public void testPageLoadedLongNamedBundleProperty() throws PartInitException, BadLocationException {
+ doTextBundlePropertyOpenOn("resources.properties", "pageMsgs['demo.long.named.property']", "demo.long.named.property");
+ }
+
+ private void doTextBundlePropertyOpenOn(String editorName, String propertyQualifiedName, String property) throws PartInitException, BadLocationException {
+ IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
+ assertTrue(editor instanceof JSPMultiPageEditor);
+ JobUtils.waitForIdle();
+ JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
+ ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+
+ IDocument document = viewer.getDocument();
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ propertyQualifiedName, true, true, false, false);
+ assertNotNull("Property:"+propertyQualifiedName+" not found",reg);
+
+ reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(),
+ property, true, true, false, false);
+ assertNotNull("Property:"+property+" not found",reg);
+
+ IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
+
+ assertNotNull("Hyperlinks for property:"+propertyQualifiedName+" are not found",links);
+
+ assertTrue("Hyperlinks for property:"+propertyQualifiedName+" are not found",links.length!=0);
+
+ boolean found = false;
+ for(IHyperlink link : links){
+ assertNotNull(link.toString());
+
+ link.open();
+ JobUtils.waitForIdle(2000);
+
+ IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if(editorName.equals(resultEditor.getTitle())){
+ found = true;
+ return;
+ }
+ }
+ assertTrue("OpenOn have not opened "+editorName+" editor",found);
+ }
+
+
+ public void testRegisteredBundlePropertyOpenOn() throws PartInitException, BadLocationException {
+ final String editorName = "resources.properties";
+ final String propertyName = "registeredMsgs.prompt";
+ IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
+ assertTrue(editor instanceof JSPMultiPageEditor);
+ JobUtils.waitForIdle();
+ JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
+ ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+
+ IDocument document = viewer.getDocument();
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ propertyName, true, true, false, false);
+
+ assertNotNull("Property:"+propertyName+" not found",reg);
+
+ IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
+
+ assertNotNull("Hyperlinks for property:"+propertyName+" are not found",links);
+
+ assertTrue("Hyperlinks for property:"+propertyName+" are not found",links.length!=0);
+
+ boolean found = false;
+ for(IHyperlink link : links){
+ assertNotNull(link.toString());
+
+ link.open();
+ JobUtils.waitForIdle(2000);
+
+ IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if(editorName.equals(resultEditor.getTitle())){
+ found = true;
+ return;
+ }
+ }
+ assertTrue("OpenOn have not opened "+editorName+" editor",found);
+ }
+
+}
+
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2011-03-03 21:32:48 UTC (rev 29481)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2011-03-03 21:37:07 UTC (rev 29482)
@@ -1,12 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jsf.text.ext.test;
@@ -27,6 +27,10 @@
"org.jboss.tools.jsf.text.ext.test",
new String[]{"projects/JSF2CompositeOpenOn"},
new String[]{"JSF2CompositeOpenOn"}));
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2MessagesOpenOnTest.class),
+ "org.jboss.tools.jsf.text.ext.test",
+ new String[]{"projects/JSF2CompositeOpenOn"},
+ new String[]{"JSF2CompositeOpenOn"}));
return suite;
}
}
\ No newline at end of file
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r29481 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-03-03 16:32:48 -0500 (Thu, 03 Mar 2011)
New Revision: 29481
Modified:
branches/jbosstools-3.2.x/build/target-platform/unified.target
Log:
update to Helios SR2 values
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-03-03 21:32:36 UTC (rev 29480)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-03-03 21:32:48 UTC (rev 29481)
@@ -22,29 +22,15 @@
<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 id="javax.wsdl" version="1.6.2.v201005080631"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<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 id="org.mozilla.xulrunner.feature.feature.group" version="1.9.12.v20110120-2050-H36-CR1"/>
<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.12.v20110120-2050-H36-CR1"/>
@@ -54,10 +40,10 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.1.v201009092123-7H7F3AkF7B79N8WCTEH"/>
+ <unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.2.v201101261720-7H7F4AkF7B88MAQCKJH"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
<unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.2.v201101261720-8X8ZFXoFLWUl6wn5veAISx"/>
- <unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.1.v201009092123-797A38s7354466855B7"/>
+ <unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.2.v201101261720-797A48s735536585A93"/>
<unit id="org.eclipse.tptp.platform.trace.feature.group" version="4.5.2.v201101261720-7L7O8fBgJ9EC9NDREaF9"/>
<unit id="org.eclipse.tptp.platform.xerces.feature.group" version="4.6.0.v201005032111-777K4AkF7B77R7c7N77"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
@@ -82,46 +68,46 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
+ <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.2.20110117_1743-b492ddb-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.2.20110117_1743-b492ddb-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"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.2.r262_v20101008-57B381wLglLKxfjdt881PQeMU42p"/>
- <unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
- <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.1.v20100915-1750-35-7w31211A2602861"/>
- <unit id="org.eclipse.birt.chart.feature.group" version="2.6.1.v20100709-7f9T7DFQCnv8nz0gRMa6NG1"/>
- <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.1.v20100915-1750-3507w31211A2602861"/>
+ <unit id="org.eclipse.birt.feature.group" version="2.6.2.r262_v20101008-9iF7A9JGHMBCRz-R8tbxRel8kQrI"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
+ <unit id="org.eclipse.birt.chart.feature.group" version="2.6.2.r262_v20101008-7f9T7OFPWowQ1naKt1Wwu4"/>
+ <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
- <unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.1.R36x_v20101007-7K7QEtDVci4YrnH_79P9K"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911"/>
- <unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LRkH_6-2D"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.1.R36x_v20101007-7K7QEtDVci4YrnH_88QAH"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKv99HL0GvIAF99I8H14B7E"/>
+ <unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LSlC_z0w1D"/>
<unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFW6FLFlmjJcvz03jyeFBLS_F"/>
<unit id="org.eclipse.platform.feature.group" version="3.6.2.r362_v20110210-9gF78Gs1FrIGnHDHWkEcopoN8AmxeZflGDGKQi"/>
- <unit id="org.eclipse.platform.ide" version="3.6.2.M20110105-0951"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi"/>
- <unit id="org.eclipse.platform.sdk" version="3.6.2.M20110105-0951"/>
- <unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL1FET3dhFTug95aglL"/>
+ <unit id="org.eclipse.platform.ide" version="3.6.2.M20110210-1200"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20110125-7N7K7bF8zk1BAKMh0iz0t94miBLY"/>
+ <unit id="org.eclipse.platform.sdk" version="3.6.2.M20110210-1200"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.6.2.r362_v20110203-7b7mFL2FET3dhHalh1iNZtL"/>
<unit id="org.eclipse.sdk.feature.group" version="3.6.2.r362_v20100929-7Q7m7HD5cWlFgdCBHllpZMd2M468sbnm2RJvUWIbiJnWC"/>
- <unit id="org.eclipse.rcp.id" version="3.6.0.M20100909-0800"/>
- <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20100909-0800"/>
+ <unit id="org.eclipse.rcp.id" version="3.6.0.M20110210-1200"/>
+ <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20110210-1200"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
- <unit id="org.eclipse.sdk.ide" version="3.6.1.M20100909-0800"/>
+ <unit id="org.eclipse.sdk.ide" version="3.6.2.M20110210-1200"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.3.1.r362_v20101014-817fFcgFE_daeVKiesDUeYc"/>
- <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
+ <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.1.r362_v20101014"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.1.R36x_v20101014-7V7RFiwFLSgEt4Pctn77c7J"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.1.r36x_v20110210-7sF99FsNFS-Ci4TSP4RDFHLIA5B3"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.0.v20100510-4--9oB5855K7P"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr"/>
- <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.0.v20100503-9I7VGAeG8tz-BY6jz0w2HLRYr"/>
- <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.1.R36x_v20101014-7u7NFVmFL9O33b-_gENgz0SvfGYz"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20100903-7H7R07v8rtOZyYbv1I6aZgou5z07"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.1.R36x_v20110210-4-09oB5865H6L02434"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFa-FX0z-z-ntoaavz0JPX628"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.2.R36x_v20110120-9I7VGEAG438GhnfSLuLz0FXP9NYJ"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.1.R36x_v20101014-7u7NFVmFL9O33b1CgDPjCI2jWYYn"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.2.r362_v20110210b-7H7R67v9rtOv_dTCawtb0WQnN92B"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.0.v20100421-79--EVVFNFFsFc"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.1.R36x_v20101007-7x7IFI3FOf7yk63X6z0kz-Z2T158"/>
@@ -133,18 +119,18 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
- <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6"/>
- <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.1.v20100618-7J8x7FBWwUL6z-2z-fcrYC2s55KI"/>
+ <unit id="org.eclipse.birt.feature.group" version="2.6.2.r262_v20101008-9iF7A9JGHMBCRz-R8tbxRel8kQrI"/>
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.2.v201010181125-7C7b8mEt1Zwkn9kfkUHHsoP_3to"/>
+ <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.2.v201010181125-7J8x7UBWwUN6z02z-fiI_w4x4uLf"/>
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.2.v201010181125-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.2.v201010181125-77078CcNBGKBZI_FcRd"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.2.v201010181125-77778fBmKDNOMgJvJ8Of7QBR"/>
<unit id="org.eclipse.draw2d.feature.group" version="3.6.2.v20110128-0100-4517w3122123901211"/>
- <unit id="org.eclipse.gef.feature.group" version="3.6.1.v20100908-1100-777B181A3Bz-6B663E7974242"/>
- <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67808yE5F-8HAH4HECF4242"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.6.2.v20110128-0100-777B381A4Bz06565376E32322"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67818yE6F-AA7P4B8I52322"/>
<unit id="org.eclipse.uml2.feature.group" version="3.1.2.v201010261927"/>
- <unit id="org.eclipse.rse.feature.group" version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ"/>
+ <unit id="org.eclipse.rse.feature.group" version="3.2.2.R32x_v201102130925-7L78FA58SreKCHr_JG7UA8bra19p"/>
<unit id="org.eclipse.rse.ssh.feature.group" version="3.0.100.v201005221100-7A2BhAkF77g7VEYDG7C"/>
<unit id="org.eclipse.rse.terminals.feature.group" version="1.0.102.R32x_v201102011435-77-DI9uCFjNZVBGlDNC332423365"/>
<unit id="org.eclipse.rse.telnet.feature.group" version="2.2.100.v201005221100-7730AkF77g7UDXELEF"/>
@@ -177,7 +163,7 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="org.eclipse.jst.jee" version="1.0.301.v201007151900"/>
+ <unit id="org.eclipse.jst.jee" version="1.0.302.v201101122300"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/>
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.103.v201101271715"/>
<unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
@@ -185,56 +171,45 @@
<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.2.v201008232129-7H777DFAKlRiOX8lGdRoz0878J"/>
- <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.2.v201008242310-7N7UF75FD3wTgbUpoff0aT"/>
- <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.2.v201008170019-377AB8s73533J5H335L"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.2.v201008190400-7b7GHf2FSK2WBLQ2D-mrubYEOrRh"/>
+ <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.3.v201010220000-7N7UF77FD3wTgcVbmmf0cT"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.3.v201101121727-377AC8s73543C6H4A5H"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.3.v201011031800-7b7GHfIFSK2WBRT6E1mcyFXGPnSh"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.3.v201102160541-7O7CFbWEMf84qYjGDyP3DNEwcgFU"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.2.v201008170029-7H7AFUQDxumQGOpBqffOY2f1qxDZ"/>
- <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.2.v201009091745-7S7WFAPFIpS-1-NbCE6tnacCXKP"/>
- <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.2.v201008170101-7C78FGMF9JgLWLMUUEMtXc"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.3.v201102160550-7H7AFUWDxumQJOi9ghcTb5YgkwEZ"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.3.v201102102045-7S7WFASFIpS-21NUD58xfPVDTLR"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.3.v201102160540-7C78FGUF9JgLWNO2UCNqfa"/>
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.3.v201101112207-7E7I7BF9JgLWPMz0VyDEHH"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.0.v201005241530-5--AkF7B77NBZBgBg"/>
<unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.1.v201008232129-7E777CF8NcJSSK-UBTwXn"/>
- <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.1.v201007070821-52FMTAkF7B77UBR7W98"/>
- <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.2.2.v20100818b-777HFGRCcNBDiBjIbhBA8"/>
+ <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.3.v201102071500-52FMUAkF7B87PAT8SA8"/>
+ <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.2.3.v20110111-777HFGSCcNBDjBdHV4BA8"/>
<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.2.0.v201005241530-31FA28s73533C66"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.2.v20100908-7A5FEi9xFc7RCJMToAIOJC43A"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.3.v201101262333-7F77FJ_C25TkfyypjhqQuxNYsMrJ"/>
- <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3"/>
- <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.5.v201009091745-67K2BgJ9DIAXCbBWJO"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.1.v20100906-4609oB5855L6N"/>
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.2.3.v201101112207-7E7I7BF9JgLWPMz0VyDEHH"/>
+ <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.6.v201101212357-67K3BgJ9DJAPEUCSKQ"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.2.v201101112207-4619oB5865D8I2331"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.300.v201005241450-2407w312116191741"/>
<unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.3.v201011031800-7B7DFEsF7RZHOaLfS0KpNJ"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.3.v201011031800-7C78FPlEdhO_oXWe4k_elbMgT1Lq"/>
<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.2.2.v20100908-30F8V8s734C3I3K"/>
+ <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.2.3.v20101104-30F8X8s734D3A4C"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.3.v20101104-7B4FBuAtJb1qEKLnCKHHHI347"/>
<unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.3.v201102160541-7E7AFI3AJrn5TN32vSJ8nRIWLD7_"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.3.v201102160541-7I78FZIEtEoO2d7AsK6jSNqC-8jj"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.2.v201008170029-7C7OFXYF7RZHQHI5PyJwPT"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.3.v201102160550-7C7OFXcF7RZHQKIkMxMsW_"/>
<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 id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/>
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
<!-- <repository location="http://dl.google.com/eclipse/plugin/3.6/"/> -->
<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"/>
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r29480 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-03-03 16:32:36 -0500 (Thu, 03 Mar 2011)
New Revision: 29480
Modified:
branches/jbosstools-3.2.x/build/target-platform/multiple.target
branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
Log:
update to Helios SR2 values
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-03-03 21:32:24 UTC (rev 29479)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-03-03 21:32:36 UTC (rev 29480)
@@ -22,12 +22,6 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
</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.eclipse.org/technology/subversive/0.7/weekly-site/"/>
</location>
@@ -46,17 +40,17 @@
<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.1.v201009092123-7H7F3AkF7B79N8WCTEH"/>
+ <unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.2.v201101261720-7H7F4AkF7B88MAQCKJH"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
<unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.2.v201101261720-8X8ZFXoFLWUl6wn5veAISx"/>
- <unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.1.v201009092123-797A38s7354466855B7"/>
+ <unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.2.v201101261720-797A48s735536585A93"/>
<unit id="org.eclipse.tptp.platform.trace.feature.group" version="4.5.2.v201101261720-7L7O8fBgJ9EC9NDREaF9"/>
<unit id="org.eclipse.tptp.platform.xerces.feature.group" version="4.6.0.v201005032111-777K4AkF7B77R7c7N77"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
<unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.2.v201101271120-7H7BF8QAkF7B87RBVCFFD"/>
<unit id="org.eclipse.tptp.platform.commons.logging.feature.group" version="4.5.0.v201005032111-2-37w312116191612"/>
<unit id="org.eclipse.tptp.platform.jakarta.log4j.feature.group" version="4.5.0.v201005032111-217E7w312116191611"/>
- <repository location="http://download.eclipse.org/tptp/updates/helios/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.emf.ecore.feature.group" version="2.6.1.v20100914-1218"/>
@@ -74,46 +68,46 @@
<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
+ <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.2.20110117_1743-b492ddb-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.2.20110117_1743-b492ddb-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"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.2.r262_v20101008-57B381wLglLKxfjdt881PQeMU42p"/>
- <unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
- <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.1.v20100915-1750-35-7w31211A2602861"/>
- <unit id="org.eclipse.birt.chart.feature.group" version="2.6.1.v20100709-7f9T7DFQCnv8nz0gRMa6NG1"/>
- <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.1.v20100915-1750-3507w31211A2602861"/>
+ <unit id="org.eclipse.birt.feature.group" version="2.6.2.r262_v20101008-9iF7A9JGHMBCRz-R8tbxRel8kQrI"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
+ <unit id="org.eclipse.birt.chart.feature.group" version="2.6.2.r262_v20101008-7f9T7OFPWowQ1naKt1Wwu4"/>
+ <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/birt/2.6/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
- <unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.1.R36x_v20101007-7K7QEtDVci4YrnH_79P9K"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911"/>
- <unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LRkH_6-2D"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.1.R36x_v20101007-7K7QEtDVci4YrnH_88QAH"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKv99HL0GvIAF99I8H14B7E"/>
+ <unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LSlC_z0w1D"/>
<unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFW6FLFlmjJcvz03jyeFBLS_F"/>
<unit id="org.eclipse.platform.feature.group" version="3.6.2.r362_v20110210-9gF78Gs1FrIGnHDHWkEcopoN8AmxeZflGDGKQi"/>
- <unit id="org.eclipse.platform.ide" version="3.6.2.M20110105-0951"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi"/>
- <unit id="org.eclipse.platform.sdk" version="3.6.2.M20110105-0951"/>
- <unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL1FET3dhFTug95aglL"/>
+ <unit id="org.eclipse.platform.ide" version="3.6.2.M20110210-1200"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20110125-7N7K7bF8zk1BAKMh0iz0t94miBLY"/>
+ <unit id="org.eclipse.platform.sdk" version="3.6.2.M20110210-1200"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.6.2.r362_v20110203-7b7mFL2FET3dhHalh1iNZtL"/>
<unit id="org.eclipse.sdk.feature.group" version="3.6.2.r362_v20100929-7Q7m7HD5cWlFgdCBHllpZMd2M468sbnm2RJvUWIbiJnWC"/>
- <unit id="org.eclipse.rcp.id" version="3.6.0.M20100909-0800"/>
- <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20100909-0800"/>
+ <unit id="org.eclipse.rcp.id" version="3.6.0.M20110210-1200"/>
+ <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20110210-1200"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
- <unit id="org.eclipse.sdk.ide" version="3.6.1.M20100909-0800"/>
+ <unit id="org.eclipse.sdk.ide" version="3.6.2.M20110210-1200"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.3.1.r362_v20101014-817fFcgFE_daeVKiesDUeYc"/>
- <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
+ <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.1.r362_v20101014"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.1.R36x_v20101014-7V7RFiwFLSgEt4Pctn77c7J"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.1.r36x_v20110210-7sF99FsNFS-Ci4TSP4RDFHLIA5B3"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.0.v20100510-4--9oB5855K7P"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr"/>
- <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.0.v20100503-9I7VGAeG8tz-BY6jz0w2HLRYr"/>
- <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.1.R36x_v20101014-7u7NFVmFL9O33b-_gENgz0SvfGYz"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20100903-7H7R07v8rtOZyYbv1I6aZgou5z07"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.1.R36x_v20110210-4-09oB5865H6L02434"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFa-FX0z-z-ntoaavz0JPX628"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.2.R36x_v20110120-9I7VGEAG438GhnfSLuLz0FXP9NYJ"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.1.R36x_v20101014-7u7NFVmFL9O33b1CgDPjCI2jWYYn"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.2.r362_v20110210b-7H7R67v9rtOv_dTCawtb0WQnN92B"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.0.v20100421-79--EVVFNFFsFc"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.1.R36x_v20101007-7x7IFI3FOf7yk63X6z0kz-Z2T158"/>
@@ -125,18 +119,18 @@
<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
- <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6"/>
- <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.1.v20100618-7J8x7FBWwUL6z-2z-fcrYC2s55KI"/>
+ <unit id="org.eclipse.birt.feature.group" version="2.6.2.r262_v20101008-9iF7A9JGHMBCRz-R8tbxRel8kQrI"/>
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.2.v201010181125-7C7b8mEt1Zwkn9kfkUHHsoP_3to"/>
+ <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.2.v201010181125-7J8x7UBWwUN6z02z-fiI_w4x4uLf"/>
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.2.v201010181125-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.2.v201010181125-77078CcNBGKBZI_FcRd"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.2.v201010181125-77778fBmKDNOMgJvJ8Of7QBR"/>
<unit id="org.eclipse.draw2d.feature.group" version="3.6.2.v20110128-0100-4517w3122123901211"/>
- <unit id="org.eclipse.gef.feature.group" version="3.6.1.v20100908-1100-777B181A3Bz-6B663E7974242"/>
- <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67808yE5F-8HAH4HECF4242"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.6.2.v20110128-0100-777B381A4Bz06565376E32322"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67818yE6F-AA7P4B8I52322"/>
<unit id="org.eclipse.uml2.feature.group" version="3.1.2.v201010261927"/>
- <unit id="org.eclipse.rse.feature.group" version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ"/>
+ <unit id="org.eclipse.rse.feature.group" version="3.2.2.R32x_v201102130925-7L78FA58SreKCHr_JG7UA8bra19p"/>
<unit id="org.eclipse.rse.ssh.feature.group" version="3.0.100.v201005221100-7A2BhAkF77g7VEYDG7C"/>
<unit id="org.eclipse.rse.terminals.feature.group" version="1.0.102.R32x_v201102011435-77-DI9uCFjNZVBGlDNC332423365"/>
<unit id="org.eclipse.rse.telnet.feature.group" version="2.2.100.v201005221100-7730AkF77g7UDXELEF"/>
@@ -166,10 +160,10 @@
<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/requirements/helios/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="org.eclipse.jst.jee" version="1.0.301.v201007151900"/>
+ <unit id="org.eclipse.jst.jee" version="1.0.302.v201101122300"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/>
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.103.v201101271715"/>
<unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
@@ -177,41 +171,41 @@
<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.2.v201008232129-7H777DFAKlRiOX8lGdRoz0878J"/>
- <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.2.v201008242310-7N7UF75FD3wTgbUpoff0aT"/>
- <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.2.v201008170019-377AB8s73533J5H335L"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.2.v201008190400-7b7GHf2FSK2WBLQ2D-mrubYEOrRh"/>
+ <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.3.v201010220000-7N7UF77FD3wTgcVbmmf0cT"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.3.v201101121727-377AC8s73543C6H4A5H"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.3.v201011031800-7b7GHfIFSK2WBRT6E1mcyFXGPnSh"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.3.v201102160541-7O7CFbWEMf84qYjGDyP3DNEwcgFU"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.2.v201008170029-7H7AFUQDxumQGOpBqffOY2f1qxDZ"/>
- <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.2.v201009091745-7S7WFAPFIpS-1-NbCE6tnacCXKP"/>
- <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.2.v201008170101-7C78FGMF9JgLWLMUUEMtXc"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.3.v201102160550-7H7AFUWDxumQJOi9ghcTb5YgkwEZ"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.3.v201102102045-7S7WFASFIpS-21NUD58xfPVDTLR"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.3.v201102160540-7C78FGUF9JgLWNO2UCNqfa"/>
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.3.v201101112207-7E7I7BF9JgLWPMz0VyDEHH"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.0.v201005241530-5--AkF7B77NBZBgBg"/>
<unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.1.v201008232129-7E777CF8NcJSSK-UBTwXn"/>
- <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.1.v201007070821-52FMTAkF7B77UBR7W98"/>
- <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.2.2.v20100818b-777HFGRCcNBDiBjIbhBA8"/>
+ <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.3.v201102071500-52FMUAkF7B87PAT8SA8"/>
+ <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.2.3.v20110111-777HFGSCcNBDjBdHV4BA8"/>
<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.2.0.v201005241530-31FA28s73533C66"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.2.v20100908-7A5FEi9xFc7RCJMToAIOJC43A"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.3.v201101262333-7F77FJ_C25TkfyypjhqQuxNYsMrJ"/>
- <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3"/>
- <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.5.v201009091745-67K2BgJ9DIAXCbBWJO"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.1.v20100906-4609oB5855L6N"/>
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.2.3.v201101112207-7E7I7BF9JgLWPMz0VyDEHH"/>
+ <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.6.v201101212357-67K3BgJ9DJAPEUCSKQ"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.2.v201101112207-4619oB5865D8I2331"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.300.v201005241450-2407w312116191741"/>
<unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.3.v201011031800-7B7DFEsF7RZHOaLfS0KpNJ"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.3.v201011031800-7C78FPlEdhO_oXWe4k_elbMgT1Lq"/>
<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.2.2.v20100908-30F8V8s734C3I3K"/>
+ <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.2.3.v20101104-30F8X8s734D3A4C"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.3.v20101104-7B4FBuAtJb1qEKLnCKHHHI347"/>
<unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.3.v201102160541-7E7AFI3AJrn5TN32vSJ8nRIWLD7_"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.3.v201102160541-7I78FZIEtEoO2d7AsK6jSNqC-8jj"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.2.v201008170029-7C7OFXYF7RZHQHI5PyJwPT"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.3.v201102160550-7C7OFXcF7RZHQKIkMxMsW_"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stabl..."/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/>
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
<!-- <repository location="http://dl.google.com/eclipse/plugin/3.6/"/> -->
<repository location="http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/"/>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-03-03 21:32:24 UTC (rev 29479)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-03-03 21:32:36 UTC (rev 29480)
@@ -34,20 +34,17 @@
<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
<repository location="http://download.eclipse.org/technology/subversive/0.7/weekly-site/"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519..."/>
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/thirdparty/"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/"/>
<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
-<repository location="http://download.eclipse.org/tptp/updates/helios/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/"/>
-<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/birt/2.6/"/>
<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
-<repository location="http://download.eclipse.org/releases/helios/"/>
-<repository location="http://download.eclipse.org/webtools/repository/helios/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2/"/>
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stabl..."/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/helios/"/>
</source>
<iu id="org.maven.ide.eclipse.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
13 years, 2 months
- 1
- 0