JBoss Tools SVN: r42527 - in trunk/documentation/guides/GettingStartedGuide/en-US: images/getting_started and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-11 21:45:30 -0400 (Wed, 11 Jul 2012)
New Revision: 42527
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_perspective_02.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_perspective_03.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_perspective_04.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_19_finger_touch.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_3.png
Log:
updated for JBDS-2192
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-12 01:01:48 UTC (rev 42526)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-12 01:45:30 UTC (rev 42527)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.1</edition>
-<pubsnumber>31</pubsnumber>
+<pubsnumber>32</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_perspective_02.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_perspective_03.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_perspective_04.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_19_finger_touch.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_3.png
===================================================================
(Binary files differ)
13 years, 9 months
JBoss Tools SVN: r42526 - in trunk/cdi/docs/reference/en-US: images/Validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-11 21:01:48 -0400 (Wed, 11 Jul 2012)
New Revision: 42526
Modified:
trunk/cdi/docs/reference/en-US/Book_Info.xml
trunk/cdi/docs/reference/en-US/images/Validation/validation_02.png
Log:
updated for JBDS-2191
Modified: trunk/cdi/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/cdi/docs/reference/en-US/Book_Info.xml 2012-07-12 00:54:29 UTC (rev 42525)
+++ trunk/cdi/docs/reference/en-US/Book_Info.xml 2012-07-12 01:01:48 UTC (rev 42526)
@@ -11,9 +11,9 @@
<productnumber>5.0</productnumber>
- <edition>5.0.0</edition>
+ <edition>5.0.1</edition>
- <pubsnumber>9</pubsnumber>
+ <pubsnumber>10</pubsnumber>
<abstract>
<para>
Modified: trunk/cdi/docs/reference/en-US/images/Validation/validation_02.png
===================================================================
(Binary files differ)
13 years, 9 months
JBoss Tools SVN: r42525 - in trunk/maven/docs/reference/en-US: images/adding_maven_support and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-11 20:54:29 -0400 (Wed, 11 Jul 2012)
New Revision: 42525
Added:
trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_06.png
trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_07.png
trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_08.png
trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_09.png
Modified:
trunk/maven/docs/reference/en-US/Book_Info.xml
trunk/maven/docs/reference/en-US/adding_maven_support.xml
Log:
updated for TOOLSDOC-281
Modified: trunk/maven/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/maven/docs/reference/en-US/Book_Info.xml 2012-07-11 23:34:27 UTC (rev 42524)
+++ trunk/maven/docs/reference/en-US/Book_Info.xml 2012-07-12 00:54:29 UTC (rev 42525)
@@ -11,9 +11,9 @@
<productnumber>5.0</productnumber>
- <edition>5.0.0</edition>
+ <edition>5.0.1</edition>
- <pubsnumber>5</pubsnumber>
+ <pubsnumber>7</pubsnumber>
<abstract>
<para>
Modified: trunk/maven/docs/reference/en-US/adding_maven_support.xml
===================================================================
--- trunk/maven/docs/reference/en-US/adding_maven_support.xml 2012-07-11 23:34:27 UTC (rev 42524)
+++ trunk/maven/docs/reference/en-US/adding_maven_support.xml 2012-07-12 00:54:29 UTC (rev 42525)
@@ -17,9 +17,110 @@
</mediaobject>
</figure>
<para>
- Right-click on the project to bring up the context menu.
+ Right-click on the project to bring up the context menu and click on <guimenuitem>Properties</guimenuitem>.
</para>
+ <!-- Maven Facet option -->
<para>
+ From the <guilabel>Properties</guilabel> screen click on <guilabel>Project Facets</guilabel>.
+ </para>
+ <figure id="adding_maven_support_06">
+ <title>Project Facets screen</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_06.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The Project Facets properties screen.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Select <guilabel>JBoss Maven Integration</guilabel> from the facets list. You will notice that a <guibutton>Further configuration required</guibutton> button appears at the bottom of the screen.
+ </para>
+ <figure id="adding_maven_support_07">
+ <title>Maven Integration facet selected</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_07.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The Maven integration facet has been selected from the facets menu.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Click on the <guibutton>Further configuration required</guibutton> button and you can either modify or accept the default values for all fields. Click the <guibutton>OK</guibutton> button to return to the facets screen.
+ </para>
+ <figure id="adding_maven_support_08">
+ <title>Maven Integration facet settings</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_08.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Setting the configuration for Maven integration.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <guibutton>Further configuration required</guibutton> button has now changed to <guibutton>Further configuration available</guibutton>. Click the <guibutton>Apply</guibutton> button and then the <guibutton>OK</guibutton> button to complete the addition of Maven support to your project.
+ </para>
+ <figure id="adding_maven_support_09">
+ <title>Maven Integration facet configured</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_09.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The JBoss Maven Integration facet has now been configured for the project.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Maven support has been added to the project, and a new <filename>pom.xml</filename> file appears in the list of files for the project. This can be viewed in the <guilabel>Project Explorer</guilabel>.
+ </para>
+ <figure id="adding_maven_support_04">
+ <title>New pom.xml file</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_04.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The project now has a new pom.xml file, seen in the Project Explorer.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Double-click on the <filename>pom.xml</filename> file to view the settings associated with it. The settings here were set in the <guilabel>Further configuration required</guilabel> step, and can be edited from this <guilabel>Overview</guilabel> screen.
+ </para>
+ <para>
+ It is recommended that you change the <guilabel>Packaging</guilabel> option to <guimenuitem>pom</guimenuitem> to avoid any issues in expansion of the project with Maven modules in the future.
+ </para>
+ <figure id="adding_maven_support_05">
+ <title>Overview screen for pom.xml</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_05.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The Overview screen for the new pom.xml file.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <!-- Convert to Maven Project option -->
+<!-- <para>
From the context menu navigate to <menuchoice><guimenuitem>Configure</guimenuitem><guimenuitem>Convert to Maven Project</guimenuitem></menuchoice>.
</para>
<figure id="adding_maven_support_01">
@@ -104,5 +205,5 @@
</phrase>
</textobject>
</mediaobject>
- </figure>
+ </figure> -->
</chapter>
\ No newline at end of file
Added: trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_06.png
===================================================================
(Binary files differ)
Property changes on: trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_06.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_07.png
===================================================================
(Binary files differ)
Property changes on: trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_07.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_08.png
===================================================================
(Binary files differ)
Property changes on: trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_08.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_09.png
===================================================================
(Binary files differ)
Property changes on: trunk/maven/docs/reference/en-US/images/adding_maven_support/adding_maven_support_09.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 9 months
JBoss Tools SVN: r42524 - in trunk/documentation/guides/GettingStartedGuide/en-US: images/getting_started and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-11 19:34:27 -0400 (Wed, 11 Jul 2012)
New Revision: 42524
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_01.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_04.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_06.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_perspective_01.png
Log:
updated for JBDS-2192
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-11 22:49:22 UTC (rev 42523)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-11 23:34:27 UTC (rev 42524)
@@ -7,8 +7,8 @@
<subtitle>Provides information on how the JBoss Developer Studio functions.</subtitle>
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
-<edition>5.0.0</edition>
-<pubsnumber>30</pubsnumber>
+<edition>5.0.1</edition>
+<pubsnumber>31</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_01.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_04.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_06.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_perspective_01.png
===================================================================
(Binary files differ)
13 years, 9 months
JBoss Tools SVN: r42523 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-07-11 18:49:22 -0400 (Wed, 11 Jul 2012)
New Revision: 42523
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseMarkerResolution.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
Log:
Make Quick Fix "Add @SuppressWarnings" work on Temporary annotations https://issues.jboss.org/browse/JBIDE-12303
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseMarkerResolution.java 2012-07-11 22:41:37 UTC (rev 42522)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseMarkerResolution.java 2012-07-11 22:49:22 UTC (rev 42523)
@@ -14,6 +14,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.ltk.core.refactoring.TextChange;
import org.eclipse.ui.IMarkerResolution2;
import org.jboss.tools.common.CommonPlugin;
@@ -59,7 +60,17 @@
private TextChange getPreviewChange(){
ICompilationUnit original = getCompilationUnit();
if(original != null){
- return getChange(original);
+ try {
+ ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
+
+ TextChange change = getChange(compilationUnit);
+
+ compilationUnit.discardWorkingCopy();
+ return change;
+ } catch (JavaModelException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+
}
return null;
}
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-07-11 22:41:37 UTC (rev 42522)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-07-11 22:49:22 UTC (rev 42523)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.common.refactoring;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.regex.Matcher;
@@ -38,12 +37,13 @@
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.jdt.internal.corext.util.CodeFormatterUtil;
+import org.eclipse.jdt.internal.ui.JavaPlugin;
+import org.eclipse.jdt.internal.ui.text.correction.proposals.EditAnnotator;
+import org.eclipse.jface.text.IDocument;
import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.TextEditBasedChange;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.text.edits.DeleteEdit;
import org.eclipse.text.edits.InsertEdit;
import org.eclipse.text.edits.MultiTextEdit;
@@ -79,8 +79,6 @@
public static final char C_CARRIAGE_RETURN = '\r';
public static final char C_NEW_LINE = '\n';
- private static final int NUMBER_OF_STRINGS = 3;
-
public static final HashSet<String> primitives = new HashSet<String>();
static{
primitives.add("void"); //$NON-NLS-1$
@@ -656,239 +654,39 @@
return null;
}
- public static String getPreview(Change previewChange) throws CoreException{
- if(previewChange == null)
- return null;
-
- // CompositeChange
- // TextEditBasedChange
- // TextChange
-
-
- String preview = getPreviewContent(previewChange);
- //String current = previewChange.getCurrentContent(new NullProgressMonitor());
-
- TextEdit edit = getEdit(previewChange);
-
- if(preview != null && edit != null){
- EditSet editSet = new EditSet(edit);
-
- // select
- preview = editSet.select(preview);
-
- // cut
- preview = editSet.cut(preview);
-
- // format
- preview = preview.replaceAll(NEW_LINE, LINE_BREAK);
-
- return preview;
- }
- return "";
- }
-
- private static String getPreviewContent(Change change) throws CoreException{
- if(change instanceof TextEditBasedChange){
- return ((TextEditBasedChange) change).getPreviewContent(new NullProgressMonitor());
- }else if(change instanceof TextChange){
- return ((TextChange) change).getPreviewContent(new NullProgressMonitor());
+ private static TextChange getTextChange(Change change){
+ if(change instanceof TextChange){
+ return (TextChange)change;
}else if(change instanceof CompositeChange){
for(Change child : ((CompositeChange) change).getChildren()){
- String prev = getPreviewContent(child);
- if(prev != null){
- return prev;
+ if(child instanceof TextChange){
+ return (TextChange)child;
}
}
}
return null;
}
-
- private static TextEdit getEdit(Change change) throws CoreException{
- if(change instanceof TextFileChange){
- return ((TextFileChange) change).getEdit();
- }else if(change instanceof TextChange){
- return ((TextChange) change).getEdit();
- }else if(change instanceof CompositeChange){
- for(Change child : ((CompositeChange) change).getChildren()){
- TextEdit prev = getEdit(child);
- if(prev != null){
- return prev;
- }
- }
- }
- return null;
- }
- static class EditSet{
- private ArrayList<TextEdit> edits = new ArrayList<TextEdit>();
- private ArrayList<Region> regions = new ArrayList<Region>();
-
- public EditSet(TextEdit edit){
- addEdits(edit);
- sort();
- }
-
- private void addEdits(TextEdit edit){
- edits.add(edit);
- for(TextEdit child : edit.getChildren()){
- addEdits(child);
+ @SuppressWarnings("restriction")
+ public static String getPreview(Change original) throws CoreException{
+ if(original == null)
+ return null;
+ StringBuffer buf= new StringBuffer();
+ try {
+ TextChange change = getTextChange(original);
+ if(change == null){
+ return "";
}
+ change.setKeepPreviewEdits(true);
+ IDocument previewDocument= change.getPreviewDocument(new NullProgressMonitor());
+ TextEdit rootEdit= change.getPreviewEdit(change.getEdit());
+
+ EditAnnotator ea= new EditAnnotator(buf, previewDocument);
+ rootEdit.accept(ea);
+ ea.unchangedUntil(previewDocument.getLength()); // Final pre-existing region
+ } catch (CoreException e) {
+ JavaPlugin.log(e);
}
-
- private void sort(){
- if(edits.size() < 2){
- return;
- }
- ArrayList<TextEdit> sorted = new ArrayList<TextEdit>();
- int offset = 0;
- int distance = 0;
- int number = edits.size();
- for(int i = 0; i < number; i++){
- TextEdit edit = edits.get(0);
- distance = edit.getOffset()-offset;
- for(TextEdit e : edits){
- if((e.getOffset()-offset) < distance){
- distance = e.getOffset()-offset;
- edit = e;
- }
- }
- sorted.add(edit);
- edits.remove(edit);
- offset = edit.getOffset();
- }
- edits = sorted;
- }
-
- public String select(String preview){
- int delta = 0;
- for(TextEdit edit : edits){
- String text = null;
- int addings = 0;
- if(edit instanceof InsertEdit){
- text = ((InsertEdit) edit).getText();
- addings = text.length();
- }else if(edit instanceof ReplaceEdit){
- text = ((ReplaceEdit) edit).getText();
- addings = text.length()-edit.getLength();
- }else if(edit instanceof DeleteEdit){
- int offset = edit.getOffset()+delta;
- int length = edit.getLength();
- regions.add(new Region(offset, 0));
- delta -= length;
- }
- if(text != null){
- int offset = edit.getOffset()+delta;
- int length = text.length();
- regions.add(new Region(offset, length));
-
- // select
- String before = preview.substring(0, offset);
- String after = preview.substring(offset+length);
- preview = before+OPEN_BOLD+text+CLOSE_BOLD+after;
-
- delta += OPEN_BOLD.length()+CLOSE_BOLD.length()+addings;
- }
- }
- return preview;
- }
-
- public String cut(String preview){
- // process regions
- Region prevRegion = null;
- for(Region region : regions){
-
- int position = region.offset;
- int count = NUMBER_OF_STRINGS;
- int lowLimit = 0;
- if(prevRegion != null){
- lowLimit = prevRegion.offset+prevRegion.length;
- }
- if(position > preview.length()-1){
- position = preview.length()-1;
- }
- while(position >= lowLimit){
- char c = preview.charAt(position);
- if(c == C_NEW_LINE){
- count--;
- if(count == 0){
- position++;
- break;
- }
- }
- position--;
- }
- if(prevRegion != null && position <= prevRegion.offset+prevRegion.length){
- prevRegion.active = false;
- int shift = region.offset - prevRegion.offset;
- region.offset = prevRegion.offset;
- region.length += shift;
- }else{
- int shift = region.offset-position;
- region.offset = position;
- region.length += shift;
-
- }
-
- position = region.offset+region.length;
- count = NUMBER_OF_STRINGS;
- while(position < preview.length()-1){
- char c = preview.charAt(position);
- if(c == C_NEW_LINE){
- count--;
- if(count == 0){
- break;
- }
- }
- position++;
- }
- region.length = position - region.offset;
- prevRegion = region;
- }
-
-
- // cut
- StringBuffer buffer = new StringBuffer();
- int index = 0;
- for(Region region : regions){
- if(!region.active){
- continue;
- }
- if(region.offset > preview.length()-1){
- region.offset = preview.length()-1;
- }
- if(region.offset < 0){
- region.offset = 0;
- }
- if(region.offset + region.length > preview.length()-1){
- region.length = (preview.length()-1)-region.offset;
- }
- if(index == 0 && region.offset != 0){
- buffer.append(DOTS+NEW_LINE);
- }
- if(region.length > 0){
- buffer.append(preview.substring(region.offset, region.offset + region.length));
- }
- if((region.offset + region.length) < (preview.length()-1)){
- if(index == regions.size()-1){
- buffer.append(NEW_LINE+DOTS);
- }else{
- buffer.append(NEW_LINE+DOTS+NEW_LINE);
- }
- }
- index++;
- }
- return buffer.toString();
- }
+ return buf.toString();
}
-
- static class Region{
- public int offset;
- public int length;
- public boolean active = true;
-
- public Region(int offset, int length){
- this.offset = offset;
- this.length = length;
- }
- }
}
13 years, 9 months
JBoss Tools SVN: r42522 - in trunk/seam/docs/reference/en-US: images/crud_database_application and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-11 18:41:37 -0400 (Wed, 11 Jul 2012)
New Revision: 42522
Modified:
trunk/seam/docs/reference/en-US/Book_Info.xml
trunk/seam/docs/reference/en-US/images/crud_database_application/crud_database_application_03.png
trunk/seam/docs/reference/en-US/images/generate_entities/generate_entities1.png
trunk/seam/docs/reference/en-US/images/seam_editors/seam_editors_4.png
trunk/seam/docs/reference/en-US/images/seam_editors/seam_editors_8.png
Log:
updated for JBDS-2193
Modified: trunk/seam/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/seam/docs/reference/en-US/Book_Info.xml 2012-07-11 20:56:02 UTC (rev 42521)
+++ trunk/seam/docs/reference/en-US/Book_Info.xml 2012-07-11 22:41:37 UTC (rev 42522)
@@ -6,8 +6,8 @@
<subtitle>Provides information relating to the Seam Developer Tools module.</subtitle>
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
- <edition>5.0.0</edition>
- <pubsnumber>8</pubsnumber>
+ <edition>5.0.1</edition>
+ <pubsnumber>9</pubsnumber>
<abstract>
<para>The Seam Developer Tools Reference Guide explains how to use the Seam Developer Tools module to create Seam projects for deployment.</para>
</abstract>
Modified: trunk/seam/docs/reference/en-US/images/crud_database_application/crud_database_application_03.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en-US/images/generate_entities/generate_entities1.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en-US/images/seam_editors/seam_editors_4.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en-US/images/seam_editors/seam_editors_8.png
===================================================================
(Binary files differ)
13 years, 9 months
JBoss Tools SVN: r42521 - in trunk: maven/features/org.jboss.tools.maven.gwt.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-11 16:56:02 -0400 (Wed, 11 Jul 2012)
New Revision: 42521
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/gwt/README.html
trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml
Log:
bump up to use GWT 3.0.1 for e42 - JBIDE-11549, JBIDE-12287, JBDS-2235, JBDS-2237
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/gwt/README.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/gwt/README.html 2012-07-11 20:52:54 UTC (rev 42520)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/gwt/README.html 2012-07-11 20:56:02 UTC (rev 42521)
@@ -31,6 +31,7 @@
<td class="bodyText">
<br/>
<ul>
+<li>com.google.gdt.eclipse.suite.e42.feature - <a class=link href=3.0.1.v201206290132-rel-r42>3.0.1.v201206290132-rel-r42</a> (JBoss Tools 3.?)</li>
<li>com.google.gdt.eclipse.suite.e37.feature - <a class=link href=2.5.0.v201112160242-rel-r37>2.5.0.v201112160242-rel-r37</a> (JBoss Tools 3.3)</li>
<li>com.google.gdt.eclipse.suite.e36.feature - <a class=link href=201012211742>1.4.2.v201012211742</a> (JBoss Tools 3.2)</li>
</ul>
Modified: trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml 2012-07-11 20:52:54 UTC (rev 42520)
+++ trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml 2012-07-11 20:56:02 UTC (rev 42521)
@@ -21,7 +21,7 @@
<requires>
<import feature="org.eclipse.m2e.feature" version="1.1.0" match="greaterOrEqual"/>
<import feature="org.maven.ide.eclipse.wtp.feature" version="0.15.0" match="greaterOrEqual"/>
- <import feature="com.google.gdt.eclipse.suite.e37.feature" version="2.5.0" match="greaterOrEqual"/>
+ <import feature="com.google.gdt.eclipse.suite.e42.feature" version="3.0.1" match="greaterOrEqual"/>
</requires>
<plugin
13 years, 9 months
JBoss Tools SVN: r42520 - in trunk/download.jboss.org/jbosstools/updates: juno/M6 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-11 16:52:54 -0400 (Wed, 11 Jul 2012)
New Revision: 42520
Removed:
trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeArtifac...
trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeContent...
trunk/download.jboss.org/jbosstools/updates/juno/M6/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/juno/M6/compositeContent.xml
Log:
purge obsolete cruft
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeArtifac...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeArtifac... 2012-07-11 20:45:15 UTC (rev 42519)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeArtifac... 2012-07-11 20:52:54 UTC (rev 42520)
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo SR1 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1328938726000'/>
-</properties>
-<children size='15'>
-<child location='../../requirements/indigo/201202012328-SR1-M/'/>
-<child location='../../requirements/birt/3.7.2.v20120207/'/>
-<child location='../../requirements/bpel/0.8.0.v20120202-0453-H135-CI/'/>
-<child location='../../requirements/bpmn2-modeler/201201302358/'/>
-<child location='../../requirements/ecf/3.5.4/'/>
-
-<child location='../../requirements/eclipse/3.7.2.M20120201-1336/'/>
-<child location='../../requirements/egit/1.2.0.201112131611/'/>
-<child location='../../requirements/emf/2.7.2.v20120130-0943/'/>
-<!-- <child location='http://dl.google.com/eclipse/plugin/3.7/'/> -->
-<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
-<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120208-1400/'/>
-
-<child location='../../requirements/mylyn/3.6.5.I20120201-0822/'/>
-<child location='../../requirements/orbit/R20110523182458/'/>
-<child location='../../requirements/swtbot/2.0.5/'/>
-<child location='../../requirements/webtools/3.3.2-20120126205453/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeContent...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeContent... 2012-07-11 20:45:15 UTC (rev 42519)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeContent... 2012-07-11 20:52:54 UTC (rev 42520)
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo SR1 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1328938728000'/>
-</properties>
-<children size='15'>
-<child location='../../requirements/indigo/201202012328-SR1-M/'/>
-<child location='../../requirements/birt/3.7.2.v20120207/'/>
-<child location='../../requirements/bpel/0.8.0.v20120202-0453-H135-CI/'/>
-<child location='../../requirements/bpmn2-modeler/201201302358/'/>
-<child location='../../requirements/ecf/3.5.4/'/>
-
-<child location='../../requirements/eclipse/3.7.2.M20120201-1336/'/>
-<child location='../../requirements/egit/1.2.0.201112131611/'/>
-<child location='../../requirements/emf/2.7.2.v20120130-0943/'/>
-<!-- <child location='http://dl.google.com/eclipse/plugin/3.7/'/> -->
-<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
-<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120208-1400/'/>
-
-<child location='../../requirements/mylyn/3.6.5.I20120201-0822/'/>
-<child location='../../requirements/orbit/R20110523182458/'/>
-<child location='../../requirements/swtbot/2.0.5/'/>
-<child location='../../requirements/webtools/3.3.2-20120126205453/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/juno/M6/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/M6/compositeArtifacts.xml 2012-07-11 20:45:15 UTC (rev 42519)
+++ trunk/download.jboss.org/jbosstools/updates/juno/M6/compositeArtifacts.xml 2012-07-11 20:52:54 UTC (rev 42520)
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Juno M6 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1334581988000'/>
-</properties>
-<children size='13'>
-<!-- new for Juno -->
-<child location='../../requirements/juno/201203230900-M6/'/>
-<child location='../../requirements/atlassian/3.0.4.v20120406/'/>
-<child location='../../requirements/birt/4.2.0.v20120320/'/>
-<child location='../../requirements/eclipse/S-4.2M6-201203151300/'/>
-<child location='../../requirements/orbit/S20120308061416/'/>
-<child location='../../requirements/webtools/S-3.4.0M6-20120319200442/'/>
-<!-- removed egit as all its features are included in juno -->
-<!-- removed emf to see if it's still needed or if it's sufficient to include juno -->
-<!-- removed mylyn as all its features are included in juno; create new atlassian bucket instead -->
-
-<!-- unchanged at the moment; may be updated later -->
-<child location='../../requirements/bpel/0.8.0.v20120209-1201-H138-CI/'/>
-<child location='../../requirements/bpmn2-modeler/201202231559/'/>
-<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
-<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120416-0900/'/>
-
-<!-- unchanged since Indigo -->
-<child location='../../requirements/ecf/3.5.4/'/>
-<child location='../../requirements/swtbot/2.0.5/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/juno/M6/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/M6/compositeContent.xml 2012-07-11 20:45:15 UTC (rev 42519)
+++ trunk/download.jboss.org/jbosstools/updates/juno/M6/compositeContent.xml 2012-07-11 20:52:54 UTC (rev 42520)
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Juno M6 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1334582001000'/>
-</properties>
-<children size='13'>
-<!-- new for Juno -->
-<child location='../../requirements/juno/201203230900-M6/'/>
-<child location='../../requirements/atlassian/3.0.4.v20120406/'/>
-<child location='../../requirements/birt/4.2.0.v20120320/'/>
-<child location='../../requirements/eclipse/S-4.2M6-201203151300/'/>
-<child location='../../requirements/orbit/S20120308061416/'/>
-<child location='../../requirements/webtools/S-3.4.0M6-20120319200442/'/>
-<!-- removed egit as all its features are included in juno -->
-<!-- removed emf to see if it's still needed or if it's sufficient to include juno -->
-<!-- removed mylyn as all its features are included in juno; create new atlassian bucket instead -->
-
-<!-- unchanged at the moment; may be updated later -->
-<child location='../../requirements/bpel/0.8.0.v20120209-1201-H138-CI/'/>
-<child location='../../requirements/bpmn2-modeler/201202231559/'/>
-<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
-<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120416-0900/'/>
-
-<!-- unchanged since Indigo -->
-<child location='../../requirements/ecf/3.5.4/'/>
-<child location='../../requirements/swtbot/2.0.5/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-</children>
-</repository>
-
13 years, 9 months
JBoss Tools SVN: r42519 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-11 16:45:15 -0400 (Wed, 11 Jul 2012)
New Revision: 42519
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
merge changes mistria did to unified.target into other .target and .p2mirror.xml files; switch from GWT for e37 to GWT for e42
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-07-11 20:44:33 UTC (rev 42518)
+++ trunk/build/target-platform/jbds.target 2012-07-11 20:45:15 UTC (rev 42519)
@@ -13,10 +13,10 @@
<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
<!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120320-0058"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201202141716"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201206251206"/>
<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
@@ -42,6 +42,7 @@
<unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
+ <unit id="org.apache.lucene.core" version="3.5.0.v20120319-2345"/>
<unit id="org.apache.lucene.highlighter" version="3.5.0.v20120319-2345"/>
<unit id="org.apache.lucene.memory" version="3.5.0.v20120319-2345"/>
<unit id="org.apache.lucene.misc" version="3.5.0.v20120319-2345"/>
@@ -194,6 +195,7 @@
<!-- JBDS-1904, JBIDE-9351, JBIDE-10094 add mylyn and jira to JBT/JBDS TP -->
<unit id="org.eclipse.mylyn_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.8.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.tasks.ide.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.compatibility.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.identity.feature.group" version="1.0.0.v20120612-0600"/>
@@ -215,29 +217,30 @@
<unit id="org.eclipse.mylyn.tasks.ui" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.core" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.bugs" version="3.8.0.v20120612-0600"/>
- <unit id="com.atlassian.connector.commons" version="4.0.0.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.branding.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.commons.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.commons.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.crucible.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.crucible.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.cvs.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.cvs.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.directclickthrough.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.fisheye.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.fisheye.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.help" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.ui" version="3.0.5.v20120518"/>
+ <unit id="com.atlassian.connector.commons" version="4.0.0.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.branding.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.commons.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.commons.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.directclickthrough.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.help" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
+ <unit id="org.xmlpull" version="1.1.3.4_v2012015148"/>
<unit id="org.eclipse.ui" version="3.103.0.v20120521-2329"/>
<unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
<unit id="org.eclipse.core.resources" version="3.8.0.v20120522-2034"/>
@@ -261,6 +264,7 @@
<unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
<unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
+ <unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
@@ -268,8 +272,8 @@
<unit id="javax.el" version="2.2.0.v201108011116"/>
<!-- GWT/GPE dependencies (include only those which are EPL or other OSS licensed!) -->
- <unit id="com.google.gdt.eclipse.suite.e37.feature.feature.group" version="2.5.2.v201202290255-rel-r37"/>
- <unit id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group" version="2.4.0.v201202290255-rel-r37"/>
+ <unit id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version="3.0.1.v201206290132-rel-r42"/>
+ <unit id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201206290132-rel-r42"/>
</location>
</locations>
</target>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2012-07-11 20:44:33 UTC (rev 42518)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2012-07-11 20:45:15 UTC (rev 42519)
@@ -55,6 +55,7 @@
<iu id="org.hamcrest.text" version=""/>
<iu id="org.hamcrest.library" version=""/>
<iu id="org.hamcrest.integration" version=""/>
+<iu id="org.apache.lucene.core" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
@@ -187,6 +188,7 @@
<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
<iu id="org.eclipse.mylyn_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.ide_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.tasks.ide.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.compatibility.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.identity.feature.group" version=""/>
@@ -231,6 +233,7 @@
<iu id="com.atlassian.connector.eclipse.subclipse.ui" version=""/>
<iu id="com.atlassian.connector.eclipse.ui" version=""/>
<iu id="com.thoughtworks.xstream" version=""/>
+<iu id="org.xmlpull" version=""/>
<iu id="org.eclipse.ui" version=""/>
<iu id="org.eclipse.core.runtime" version=""/>
<iu id="org.eclipse.core.resources" version=""/>
@@ -254,13 +257,14 @@
<iu id="org.mortbay.jetty.server" version=""/>
<iu id="org.mortbay.jetty.util" version=""/>
<iu id="org.apache.jasper" version=""/>
+<iu id="org.apache.catalina" version=""/>
<iu id="org.joda.time" version=""/>
<iu id="javax.servlet" version=""/>
<iu id="javax.servlet.jsp" version=""/>
<iu id="javax.xml.rpc" version=""/>
<iu id="javax.el" version=""/>
-<iu id="com.google.gdt.eclipse.suite.e37.feature.feature.group" version=""/>
-<iu id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group" version=""/>
+<iu id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version=""/>
+<iu id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version=""/>
</p2.mirror>
</target>
</project>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-11 20:44:33 UTC (rev 42518)
+++ trunk/build/target-platform/multiple.target 2012-07-11 20:45:15 UTC (rev 42519)
@@ -14,10 +14,10 @@
<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
<!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201202141716"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201206251206"/>
<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
@@ -43,6 +43,7 @@
<unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
+ <unit id="org.apache.lucene.core" version="3.5.0.v20120319-2345"/>
<unit id="org.apache.lucene.highlighter" version="3.5.0.v20120319-2345"/>
<unit id="org.apache.lucene.memory" version="3.5.0.v20120319-2345"/>
<unit id="org.apache.lucene.misc" version="3.5.0.v20120319-2345"/>
@@ -215,6 +216,7 @@
<!-- JBDS-1904, JBIDE-9351, JBIDE-10094 add mylyn and jira to JBT/JBDS TP -->
<unit id="org.eclipse.mylyn_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.8.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.tasks.ide.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.compatibility.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.identity.feature.group" version="1.0.0.v20120612-0600"/>
@@ -236,29 +238,30 @@
<unit id="org.eclipse.mylyn.tasks.ui" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.core" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.bugs" version="3.8.0.v20120612-0600"/>
- <unit id="com.atlassian.connector.commons" version="4.0.0.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.branding.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.commons.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.commons.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.crucible.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.crucible.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.cvs.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.cvs.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.directclickthrough.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.fisheye.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.fisheye.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.help" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.5.v20120518"/>
- <unit id="com.atlassian.connector.eclipse.ui" version="3.0.5.v20120518"/>
+ <unit id="com.atlassian.connector.commons" version="4.0.0.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.branding.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.commons.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.commons.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.directclickthrough.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.help" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
+ <unit id="org.xmlpull" version="1.1.3.4_v2012015148"/>
<unit id="org.eclipse.ui" version="3.103.0.v20120521-2329"/>
<unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
<unit id="org.eclipse.core.resources" version="3.8.0.v20120522-2034"/>
@@ -282,6 +285,7 @@
<unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
<unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
+ <unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
@@ -303,8 +307,8 @@
<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="4.2.0.v20120613-1143-51-7w3123172402254"/>
<!-- GWT/GPE dependencies (include only those which are EPL or other OSS licensed!) -->
- <unit id="com.google.gdt.eclipse.suite.e37.feature.feature.group" version="2.5.2.v201202290255-rel-r37"/>
- <unit id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group" version="2.4.0.v201202290255-rel-r37"/>
+ <unit id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version="3.0.1.v201206290132-rel-r42"/>
+ <unit id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201206290132-rel-r42"/>
</location>
</locations>
<includeBundles>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-07-11 20:44:33 UTC (rev 42518)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-07-11 20:45:15 UTC (rev 42519)
@@ -55,6 +55,7 @@
<iu id="org.hamcrest.text" version=""/>
<iu id="org.hamcrest.library" version=""/>
<iu id="org.hamcrest.integration" version=""/>
+<iu id="org.apache.lucene.core" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
@@ -207,6 +208,7 @@
<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
<iu id="org.eclipse.mylyn_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.ide_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.tasks.ide.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.compatibility.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.identity.feature.group" version=""/>
@@ -251,6 +253,7 @@
<iu id="com.atlassian.connector.eclipse.subclipse.ui" version=""/>
<iu id="com.atlassian.connector.eclipse.ui" version=""/>
<iu id="com.thoughtworks.xstream" version=""/>
+<iu id="org.xmlpull" version=""/>
<iu id="org.eclipse.ui" version=""/>
<iu id="org.eclipse.core.runtime" version=""/>
<iu id="org.eclipse.core.resources" version=""/>
@@ -274,6 +277,7 @@
<iu id="org.mortbay.jetty.server" version=""/>
<iu id="org.mortbay.jetty.util" version=""/>
<iu id="org.apache.jasper" version=""/>
+<iu id="org.apache.catalina" version=""/>
<iu id="org.joda.time" version=""/>
<iu id="javax.servlet" version=""/>
<iu id="javax.servlet.jsp" version=""/>
@@ -289,8 +293,8 @@
<iu id="org.eclipse.birt.integration.wtp.feature.group" version=""/>
<iu id="org.eclipse.birt.chart.feature.group" version=""/>
<iu id="org.eclipse.birt.chart.integration.wtp.feature.group" version=""/>
-<iu id="com.google.gdt.eclipse.suite.e37.feature.feature.group" version=""/>
-<iu id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group" version=""/>
+<iu id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version=""/>
+<iu id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version=""/>
<iu id="org.mozilla.xulrunner.feature.feature.group" version=""/>
<iu id="org.mozilla.xpcom.feature.feature.group" version=""/>
</p2.mirror>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-11 20:44:33 UTC (rev 42518)
+++ trunk/build/target-platform/unified.target 2012-07-11 20:45:15 UTC (rev 42519)
@@ -14,10 +14,10 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.SR0..."/>
<!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201206251206"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201206251206"/>
<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
@@ -307,8 +307,8 @@
<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="4.2.0.v20120613-1143-51-7w3123172402254"/>
<!-- GWT/GPE dependencies (include only those which are EPL or other OSS licensed!) -->
- <unit id="com.google.gdt.eclipse.suite.e37.feature.feature.group" version="2.5.2.v201202290255-rel-r37"/>
- <unit id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group" version="2.4.0.v201202290255-rel-r37"/>
+ <unit id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version="3.0.1.v201206290132-rel-r42"/>
+ <unit id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201206290132-rel-r42"/>
</location>
</locations>
<includeBundles>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2012-07-11 20:44:33 UTC (rev 42518)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2012-07-11 20:45:15 UTC (rev 42519)
@@ -55,6 +55,7 @@
<iu id="org.hamcrest.text" version=""/>
<iu id="org.hamcrest.library" version=""/>
<iu id="org.hamcrest.integration" version=""/>
+<iu id="org.apache.lucene.core" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
@@ -207,6 +208,7 @@
<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
<iu id="org.eclipse.mylyn_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.ide_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.tasks.ide.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.compatibility.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.identity.feature.group" version=""/>
@@ -251,6 +253,7 @@
<iu id="com.atlassian.connector.eclipse.subclipse.ui" version=""/>
<iu id="com.atlassian.connector.eclipse.ui" version=""/>
<iu id="com.thoughtworks.xstream" version=""/>
+<iu id="org.xmlpull" version=""/>
<iu id="org.eclipse.ui" version=""/>
<iu id="org.eclipse.core.runtime" version=""/>
<iu id="org.eclipse.core.resources" version=""/>
@@ -274,6 +277,7 @@
<iu id="org.mortbay.jetty.server" version=""/>
<iu id="org.mortbay.jetty.util" version=""/>
<iu id="org.apache.jasper" version=""/>
+<iu id="org.apache.catalina" version=""/>
<iu id="org.joda.time" version=""/>
<iu id="javax.servlet" version=""/>
<iu id="javax.servlet.jsp" version=""/>
@@ -289,8 +293,8 @@
<iu id="org.eclipse.birt.integration.wtp.feature.group" version=""/>
<iu id="org.eclipse.birt.chart.feature.group" version=""/>
<iu id="org.eclipse.birt.chart.integration.wtp.feature.group" version=""/>
-<iu id="com.google.gdt.eclipse.suite.e37.feature.feature.group" version=""/>
-<iu id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group" version=""/>
+<iu id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version=""/>
+<iu id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version=""/>
<iu id="org.mozilla.xulrunner.feature.feature.group" version=""/>
<iu id="org.mozilla.xpcom.feature.feature.group" version=""/>
</p2.mirror>
13 years, 9 months
JBoss Tools SVN: r42518 - trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-11 16:44:33 -0400 (Wed, 11 Jul 2012)
New Revision: 42518
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/IncludeModelTest.java
Log:
JBIDE-3526
https://issues.jboss.org/browse/JBIDE-3526
Test is modified to check that external vars are available in ELContext.
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/IncludeModelTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/IncludeModelTest.java 2012-07-11 20:41:24 UTC (rev 42517)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/IncludeModelTest.java 2012-07-11 20:44:33 UTC (rev 42518)
@@ -18,6 +18,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Path;
+import org.jboss.tools.common.el.core.resolver.ELContext;
import org.jboss.tools.common.el.core.resolver.Var;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.PageContextFactory;
@@ -66,6 +67,12 @@
List<Var> vars = kbProject.getIncludeModel().getVars(new Path("/TestKbModel/WebContent/pages/params/template.xhtml"));
assertEquals(6, vars.size());
+
+ IFile f1 = project.getFile("WebContent/pages/params/template.xhtml");
+ ELContext context = PageContextFactory.createPageContext(f1);
+ Var[] vars1 = context.getVars(0);
+ assertEquals(6, vars1.length);
+
}
}
\ No newline at end of file
13 years, 9 months