JBoss Tools SVN: r42258 - trunk/download.jboss.org/jbosstools/updates/requirements/gwt.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-27 15:50:44 -0400 (Wed, 27 Jun 2012)
New Revision: 42258
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build-2.5.2....
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml
Log:
add builder for GWT 2.6.1
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build-2.5.2.... (from rev 42257, trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build-2.5.2.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build-2.5.2.... 2012-06-27 19:50:44 UTC (rev 42258)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/gwt/build.xml -Ddestination=/tmp/gwt-repo
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://dl.google.com/eclipse/plugin/3.7" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/gwt/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/2.5.2.v201202290255-rel-r37" name="Google Plugin for Eclipse 3.7" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+ <!-- JBDS-1737: GPE and GWT SDK -->
+ <iu id="com.google.gdt.eclipse.suite.e37.feature.feature.group"/>
+ <iu id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group"/>
+
+ <!-- JBIDE-11167: Windowbuilder and GDT Designer -->
+ <iu id="com.google.gdt.eclipse.designer.hosted.feature.feature.group"/>
+ <iu id="com.google.gdt.eclipse.designer.editor.feature.feature.group"/>
+ <iu id="com.google.gdt.eclipse.designer.gpe.feature.feature.group"/>
+ <iu id="org.eclipse.wb.core.feature.feature.group"/>
+ <iu id="org.eclipse.wb.css.feature.feature.group"/>
+ <iu id="org.eclipse.wb.core.xml.feature.feature.group"/>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.5.2.v201202290255-rel-r37" artifactRepository="file:${destination}/2.5.2.v201202290255-rel-r37" publishartifacts="true" source="${destination}/2.5.2.v201202290255-rel-r37" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml 2012-06-27 18:56:03 UTC (rev 42257)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml 2012-06-27 19:50:44 UTC (rev 42258)
@@ -21,7 +21,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/2.5.2.v201202290255-rel-r37" name="Google Plugin for Eclipse 3.7" />
+ <repository location="file:${destination}/2.6.1.v201205091048-rel-r37" name="Google Plugin for Eclipse 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -39,6 +39,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.5.2.v201202290255-rel-r37" artifactRepository="file:${destination}/2.5.2.v201202290255-rel-r37" publishartifacts="true" source="${destination}/2.5.2.v201202290255-rel-r37" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.6.1.v201205091048-rel-r37" artifactRepository="file:${destination}/2.6.1.v201205091048-rel-r37" publishartifacts="true" source="${destination}/2.6.1.v201205091048-rel-r37" compress="${compress}" />
</target>
</project>
13 years, 3 months
JBoss Tools SVN: r42257 - in trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse: OLD and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-27 14:56:03 -0400 (Wed, 27 Jun 2012)
New Revision: 42257
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/OLD/
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/OLD/bu...
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/OLD/po...
Removed:
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-...
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom-ju...
Log:
move into OLD
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/OLD/bu... (from rev 42256, trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/OLD/bu... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/OLD/bu... 2012-06-27 18:56:03 UTC (rev 42257)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/m2eclipse/build.xml -Ddestination=/tmp/m2eclipse-repo
+ -->
+ <target name="mirror">
+ <!-- <property name="URL1" value="http://download.jboss.org/jbosstools/updates/m2eclipse-wtp/"/> -->
+ <property name="URL1" value="file:///home/hudson/RHDS/updates/requirements/m2eclipse/1.1.0.20120320-0058/"/>
+ <!-- <property name="URL1" value="http://download.eclipse.org/technology/m2e/milestones/1.1/1.1.0.20120320-..."/> -->
+ <property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.15..."/>
+ <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl..."/>
+ <property name="URL4" value="http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/"/>
+ <property name="URL5" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a..."/>
+
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/m2eclipse/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/20120502-1415" name="m2e 1.1, m2e-extras 0.15.0.N, m2e-wtp 0.15.2, m2e-jdt-compiler 1.0 (for use with Indigo + Juno; mirrored 20120502-1415)" />
+ <source>
+ <repository location="${URL1}" />
+ <repository location="${URL2}" />
+ <repository location="${URL3}" />
+ <repository location="${URL4}" />
+ <repository location="${URL5}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120502-1415/" artifactRepository="file:${destination}/20120502-1415/"
+ publishartifacts="true" source="${destination}/20120502-1415/" compress="${compress}" />
+ </target>
+</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/OLD/po... (from rev 42256, trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom-ju...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/OLD/po... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/OLD/po... 2012-06-27 18:56:03 UTC (rev 42257)
@@ -0,0 +1,112 @@
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.requirements.m2e</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <properties>
+ <!-- TODO: when there's enough of these scripts, externalize these to a
+ parent pom in ../ -->
+ <tychoVersion>0.14.0</tychoVersion>
+ <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
+
+ <!-- TODO: update this every time you use this script against a new target
+ version + resulting folder -->
+ <URL1>file:///home/hudson/RHDS/updates/requirements/m2eclipse/1.1.0.20120320-0058/</URL1>
+ <URL2>https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.15...</URL2>
+ <URL3>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl...</URL3>
+ <URL4>http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/</URL4>
+ <URL5>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</URL5>
+ <siteVersion>20120502-1415</siteVersion>
+ <destination>${project.build.directory}/../${siteVersion}</destination>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!-- see http://wiki.eclipse.org/Tycho/Additional_Tools -->
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-p2-extras-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>mirror</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <source>
+ <repository>
+ <url>${URL1}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${URL2}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${URL3}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${URL4}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${URL5}</url>
+ <layout>p2</layout>
+ </repository>
+ </source>
+
+ <!-- List of IUs to mirror. If omitted, all IUs will be mirrored. -->
+ <!-- Omitted IU version element means latest version of the IU -->
+ <!-- <ius>
+ <iu>
+ <id>org.foo.feature.feature.group</id>
+ </iu>
+ </ius> -->
+ <!-- The destination directory to mirror to. -->
+ <destination>${destination}</destination>
+ <!-- Whether only strict dependencies should be followed. -->
+ <!-- "strict" means perfect version match -->
+ <followStrictOnly>true</followStrictOnly>
+ <!-- Whether or not to follow optional requirements. -->
+ <includeOptional>true</includeOptional>
+ <!-- Whether or not to follow non-greedy requirements. -->
+ <includeNonGreedy>true</includeNonGreedy>
+ <!-- filter properties. E.g. filter only one platform -->
+ <!-- <filter> <osgi.os>linux</osgi.os> <osgi.ws>gtk</osgi.ws> <osgi.arch>x86_64</osgi.arch>
+ </filter> -->
+ <latestVersionOnly>true</latestVersionOnly>
+ <mirrorMetadataOnly>false</mirrorMetadataOnly>
+ <compress>true</compress>
+ <append>false</append>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>install</phase>
+ <configuration>
+ <quiet>true</quiet>
+ <tasks>
+ <!-- do stuff w/ ant here -->
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-... 2012-06-27 18:38:45 UTC (rev 42256)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-... 2012-06-27 18:56:03 UTC (rev 42257)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="mirror">
- <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
-
- -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
- -consoleLog -nosplash -data /tmp
- -application org.eclipse.ant.core.antRunner
- -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml"
-
- or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
-
- export JAVA_HOME=/opt/jdk1.6.0; \
- ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
- org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
- -application org.eclipse.ant.core.antRunner \
- -f ~/RHDS/updates/requirements/m2eclipse/build.xml -Ddestination=/tmp/m2eclipse-repo
- -->
- <target name="mirror">
- <!-- <property name="URL1" value="http://download.jboss.org/jbosstools/updates/m2eclipse-wtp/"/> -->
- <property name="URL1" value="file:///home/hudson/RHDS/updates/requirements/m2eclipse/1.1.0.20120320-0058/"/>
- <!-- <property name="URL1" value="http://download.eclipse.org/technology/m2e/milestones/1.1/1.1.0.20120320-..."/> -->
- <property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.15..."/>
- <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl..."/>
- <property name="URL4" value="http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/"/>
- <property name="URL5" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a..."/>
-
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/m2eclipse/" />
- <property name="compress" value="true" />
-
- <p2.mirror>
- <repository location="file:${destination}/20120502-1415" name="m2e 1.1, m2e-extras 0.15.0.N, m2e-wtp 0.15.2, m2e-jdt-compiler 1.0 (for use with Indigo + Juno; mirrored 20120502-1415)" />
- <source>
- <repository location="${URL1}" />
- <repository location="${URL2}" />
- <repository location="${URL3}" />
- <repository location="${URL4}" />
- <repository location="${URL5}" />
- </source>
-
- <slicingOptions includeFeatures="true" followStrict="true" />
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120502-1415/" artifactRepository="file:${destination}/20120502-1415/"
- publishartifacts="true" source="${destination}/20120502-1415/" compress="${compress}" />
- </target>
-</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom-ju...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom-ju... 2012-06-27 18:38:45 UTC (rev 42256)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom-ju... 2012-06-27 18:56:03 UTC (rev 42257)
@@ -1,112 +0,0 @@
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.requirements.m2e</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <properties>
- <!-- TODO: when there's enough of these scripts, externalize these to a
- parent pom in ../ -->
- <tychoVersion>0.14.0</tychoVersion>
- <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
-
- <!-- TODO: update this every time you use this script against a new target
- version + resulting folder -->
- <URL1>file:///home/hudson/RHDS/updates/requirements/m2eclipse/1.1.0.20120320-0058/</URL1>
- <URL2>https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.15...</URL2>
- <URL3>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl...</URL3>
- <URL4>http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/</URL4>
- <URL5>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</URL5>
- <siteVersion>20120502-1415</siteVersion>
- <destination>${project.build.directory}/../${siteVersion}</destination>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <!-- see http://wiki.eclipse.org/Tycho/Additional_Tools -->
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <version>${tychoVersion}</version>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <source>
- <repository>
- <url>${URL1}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <url>${URL2}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <url>${URL3}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <url>${URL4}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <url>${URL5}</url>
- <layout>p2</layout>
- </repository>
- </source>
-
- <!-- List of IUs to mirror. If omitted, all IUs will be mirrored. -->
- <!-- Omitted IU version element means latest version of the IU -->
- <!-- <ius>
- <iu>
- <id>org.foo.feature.feature.group</id>
- </iu>
- </ius> -->
- <!-- The destination directory to mirror to. -->
- <destination>${destination}</destination>
- <!-- Whether only strict dependencies should be followed. -->
- <!-- "strict" means perfect version match -->
- <followStrictOnly>true</followStrictOnly>
- <!-- Whether or not to follow optional requirements. -->
- <includeOptional>true</includeOptional>
- <!-- Whether or not to follow non-greedy requirements. -->
- <includeNonGreedy>true</includeNonGreedy>
- <!-- filter properties. E.g. filter only one platform -->
- <!-- <filter> <osgi.os>linux</osgi.os> <osgi.ws>gtk</osgi.ws> <osgi.arch>x86_64</osgi.arch>
- </filter> -->
- <latestVersionOnly>true</latestVersionOnly>
- <mirrorMetadataOnly>false</mirrorMetadataOnly>
- <compress>true</compress>
- <append>false</append>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${maven.antrun.plugin.version}</version>
- <executions>
- <execution>
- <id>install</id>
- <phase>install</phase>
- <configuration>
- <quiet>true</quiet>
- <tasks>
- <!-- do stuff w/ ant here -->
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
13 years, 3 months
JBoss Tools SVN: r42256 - in trunk/central/plugins/org.jboss.tools.central: src/org/jboss/tools/central/editors/xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-06-27 14:38:45 -0400 (Wed, 27 Jun 2012)
New Revision: 42256
Modified:
trunk/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/OverviewToolTip.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java
Log:
https://issues.jboss.org/browse/JBIDE-12239 Migrate Central module to eclipse Juno
patch committed after Snjezana review and approval
Modified: trunk/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF 2012-06-27 18:37:48 UTC (rev 42255)
+++ trunk/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF 2012-06-27 18:38:45 UTC (rev 42256)
@@ -19,10 +19,11 @@
org.eclipse.mylyn.commons.core;bundle-version="3.6.0",
org.eclipse.mylyn.discovery.ui;bundle-version="3.6.0",
org.eclipse.mylyn.discovery.core;bundle-version="3.6.0",
- org.eclipse.mylyn.commons.ui;bundle-version="[3.6.0,3.8.0)",
+ org.eclipse.mylyn.commons.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.equinox.p2.ui.sdk;bundle-version="1.0.200",
org.eclipse.equinox.p2.core;bundle-version="2.1.0",
- org.eclipse.equinox.p2.engine;bundle-version="2.1.0"
+ org.eclipse.equinox.p2.engine;bundle-version="2.1.0",
+ org.eclipse.mylyn.commons.workbench;bundle-version="3.8.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java 2012-06-27 18:37:48 UTC (rev 42255)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java 2012-06-27 18:38:45 UTC (rev 42256)
@@ -62,11 +62,11 @@
import org.eclipse.mylyn.internal.discovery.ui.DiscoveryUi;
import org.eclipse.mylyn.internal.discovery.ui.wizards.ConnectorDiscoveryWizard;
import org.eclipse.mylyn.internal.discovery.ui.wizards.Messages;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonThemes;
-import org.eclipse.mylyn.internal.provisional.commons.ui.GradientCanvas;
-import org.eclipse.mylyn.internal.provisional.commons.ui.SelectionProviderAdapter;
-import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil;
+import org.eclipse.mylyn.commons.ui.CommonImages;
+import org.eclipse.mylyn.commons.ui.compatibility.CommonThemes;
+import org.eclipse.mylyn.commons.ui.GradientCanvas;
+import org.eclipse.mylyn.commons.ui.SelectionProviderAdapter;
+import org.eclipse.mylyn.commons.workbench.browser.BrowserUtil;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.accessibility.ACC;
@@ -239,7 +239,7 @@
providerLabel.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- WorkbenchUtil.openUrl(connector.getCertification().getUrl(),
+ BrowserUtil.openUrl(connector.getCertification().getUrl(),
IWorkbenchBrowserSupport.AS_EXTERNAL);
}
});
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/OverviewToolTip.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/OverviewToolTip.java 2012-06-27 18:37:48 UTC (rev 42255)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/OverviewToolTip.java 2012-06-27 18:38:45 UTC (rev 42256)
@@ -17,11 +17,11 @@
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.window.ToolTip;
+import org.eclipse.mylyn.commons.ui.GradientToolTip;
+import org.eclipse.mylyn.commons.workbench.browser.BrowserUtil;
import org.eclipse.mylyn.internal.discovery.core.model.AbstractDiscoverySource;
import org.eclipse.mylyn.internal.discovery.core.model.Overview;
import org.eclipse.mylyn.internal.discovery.ui.wizards.Messages;
-import org.eclipse.mylyn.internal.provisional.commons.ui.GradientToolTip;
-import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
@@ -172,7 +172,7 @@
link.setToolTipText(NLS.bind(Messages.ConnectorDescriptorToolTip_detailsLink_tooltip, overview.getUrl()));
link.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- WorkbenchUtil.openUrl(overview.getUrl(), IWorkbenchBrowserSupport.AS_EXTERNAL);
+ BrowserUtil.openUrl(overview.getUrl(), IWorkbenchBrowserSupport.AS_EXTERNAL);
}
public void widgetDefaultSelected(SelectionEvent e) {
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java 2012-06-27 18:37:48 UTC (rev 42255)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java 2012-06-27 18:38:45 UTC (rev 42256)
@@ -31,7 +31,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin;
-import org.eclipse.mylyn.internal.provisional.commons.ui.Messages;
+import org.eclipse.mylyn.internal.commons.workbench.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.accessibility.ACC;
import org.eclipse.swt.accessibility.AccessibleAdapter;
13 years, 3 months
JBoss Tools SVN: r42254 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-06-27 14:28:45 -0400 (Wed, 27 Jun 2012)
New Revision: 42254
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/SourceSelectionBuilder.java
Log:
fixed NPE:
java.lang.NullPointerException
at org.jboss.tools.jst.jsp.selection.SourceSelectionBuilder.getSelection(SourceSelectionBuilder.java:35)
at org.jboss.tools.jst.jsp.selection.bar.SelectionBar.updateNodes(SelectionBar.java:266)
at org.jboss.tools.jst.jsp.selection.bar.NodeListener$SelectionBarUpdateJob.runInUIThread(SelectionBar.java:865)
at org.eclipse.ui.progress.UIJob$1.run(UIJob.java:95)
at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35)
at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:135)
at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3529)
at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3182)
at org.jboss.tools.test.util.JobUtils.delay(JobUtils.java:57)
at org.jboss.tools.test.util.JobUtils.waitForIdle(JobUtils.java:36)
at org.jboss.tools.test.util.JobUtils.waitForIdle(JobUtils.java:30)
at org.jboss.tools.test.util.JobUtils.waitForIdle(JobUtils.java:26)
at org.jboss.tools.test.util.ProjectImportTestSetup.tearDown(ProjectImportTestSetup.java:85)
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/SourceSelectionBuilder.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/SourceSelectionBuilder.java 2012-06-27 18:27:31 UTC (rev 42253)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/SourceSelectionBuilder.java 2012-06-27 18:28:45 UTC (rev 42254)
@@ -32,6 +32,9 @@
}
public SourceSelection getSelection() {
+ if(sourceEditor == null || sourceEditor.getTextViewer() == null){
+ return null;
+ }
Point range = sourceEditor.getTextViewer().getSelectedRange();
int anchorPosition = range.x;
int focusPosition = range.x + range.y;
13 years, 3 months
JBoss Tools SVN: r42252 - branches/jbosstools-3.3.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-27 14:23:00 -0400 (Wed, 27 Jun 2012)
New Revision: 42252
Modified:
branches/jbosstools-3.3.x/build/parent/pom.xml
Log:
bump parent pom v3.3.0.Final to include cause components to be at 3.3.1.CR1/5.0.1.CR1 instead of 3.3.0.Final/5.0.0.GA
Modified: branches/jbosstools-3.3.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/build/parent/pom.xml 2012-06-27 18:13:03 UTC (rev 42251)
+++ branches/jbosstools-3.3.x/build/parent/pom.xml 2012-06-27 18:23:00 UTC (rev 42252)
@@ -16,9 +16,9 @@
<tychoVersion>0.14.1</tychoVersion>
<tychoExtrasVersion>0.14.0</tychoExtrasVersion>
<scmBranch>trunk</scmBranch>
- <JBT_VERSION>3.3.0</JBT_VERSION>
- <JBDS_VERSION>5.0.0</JBDS_VERSION>
- <BUILD_ALIAS>Final</BUILD_ALIAS>
+ <JBT_VERSION>3.3.1</JBT_VERSION>
+ <JBDS_VERSION>5.0.1</JBDS_VERSION>
+ <BUILD_ALIAS>CR1</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
13 years, 3 months
JBoss Tools SVN: r42251 - in trunk/download.jboss.org/jbosstools/updates: requirements/m2eclipse and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-27 14:13:03 -0400 (Wed, 27 Jun 2012)
New Revision: 42251
Modified:
trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
Log:
provide new updated m2e repo for use with Juno
Modified: trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeArtifacts.xml 2012-06-27 17:26:46 UTC (rev 42250)
+++ trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeArtifacts.xml 2012-06-27 18:13:03 UTC (rev 42251)
@@ -3,7 +3,7 @@
<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='1340662507000'/>
+<property name='p2.timestamp' value='1340820659000'/>
</properties>
<children size='11'>
<!-- new for Juno -->
@@ -19,7 +19,7 @@
<child location='../../requirements/gwt/2.5.2.v201202290255-rel-r37/'/>
<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120531-1100/'/>
+<child location='../../requirements/m2eclipse/20120627-1400/'/>
<!-- unchanged since Indigo -->
<child location='../../requirements/ecf/3.5.6/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeContent.xml 2012-06-27 17:26:46 UTC (rev 42250)
+++ trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeContent.xml 2012-06-27 18:13:03 UTC (rev 42251)
@@ -3,7 +3,7 @@
<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='1340662507000'/>
+<property name='p2.timestamp' value='1340820655000'/>
</properties>
<children size='11'>
<!-- new for Juno -->
@@ -19,7 +19,7 @@
<child location='../../requirements/gwt/2.5.2.v201202290255-rel-r37/'/>
<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120531-1100/'/>
+<child location='../../requirements/m2eclipse/20120627-1400/'/>
<!-- unchanged since Indigo -->
<child location='../../requirements/ecf/3.5.6/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2012-06-27 17:26:46 UTC (rev 42250)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2012-06-27 18:13:03 UTC (rev 42251)
@@ -16,30 +16,30 @@
-f ~/RHDS/updates/requirements/m2eclipse/build.xml -Ddestination=/tmp/m2eclipse-repo
-->
<target name="mirror">
- <property name="URL1" value="http://download.jboss.org/jbosstools/updates/m2eclipse-wtp/"/>
- <property name="URL2" value="http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/"/>
- <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a..."/>
-
- <!--
<property name="URL1" value="http://download.eclipse.org/technology/m2e/releases/"/>
- <property name="URL2" value="http://repository.sonatype.org/content/repositories/forge-sites/m2e-extra..."/>
- -->
+ <property name="URL2" value="https://repository.sonatype.org/content/repositories/forge-sites/m2e-extr..."/>
+
+ <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl..."/>
+ <property name="URL4" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-j..."/>
+ <property name="URL5" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a..."/>
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/m2eclipse/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/20120531-1100" name="m2e 1.0, m2e-wtp 0.15.2, m2e-extras 0.15, m2e-jdt-compiler 1.0, m2e-apt 1.0 (mirrored 20120531-1100)" />
+ <repository location="file:${destination}/20120627-1400" name="m2e 1.1, m2e-extras 0.15, m2e-wtp 0.15.2, m2e-jdt-compiler 1.0, m2e-apt 1.0 (mirrored 20120627-1400)" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
<repository location="${URL3}" />
+ <repository location="${URL4}" />
+ <repository location="${URL5}" />
</source>
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120531-1100/" artifactRepository="file:${destination}/20120531-1100/"
- publishartifacts="true" source="${destination}/20120531-1100/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120627-1400/" artifactRepository="file:${destination}/20120627-1400/"
+ publishartifacts="true" source="${destination}/20120627-1400/" compress="${compress}" />
</target>
</project>
13 years, 3 months
JBoss Tools SVN: r42250 - trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-06-27 13:26:46 -0400 (Wed, 27 Jun 2012)
New Revision: 42250
Modified:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java
Log:
JBIDE-12261
org.jboss.tools.jsf.jsp.ca.test.CADefaultELStartingCharTest and CAJsfPredictiveTagNameProposalsTest failures
Issue is fixed.
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java 2012-06-27 17:05:09 UTC (rev 42249)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java 2012-06-27 17:26:46 UTC (rev 42250)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2011 Red Hat, Inc.
+ * Copyright (c) 2007-2012 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,
@@ -18,11 +18,11 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContentAssistant;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
@@ -31,6 +31,7 @@
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.test.util.WorkbenchUtils;
+@SuppressWarnings("restriction")
public abstract class AbstractContentAssistantTestCase extends TestCase {
protected String fileName;
protected IProject project = null;
@@ -48,14 +49,22 @@
viewer = getTextViewer();
document = viewer.getDocument();
- SourceViewerConfiguration config = CATestUtil
- .getSourceViewerConfiguration(textEditor);
+// SourceViewerConfiguration config = CATestUtil
+// .getSourceViewerConfiguration(textEditor);
+ assertNotNull("Cannot get the Source Viewer for the editor for page \"" //$NON-NLS-1$
+ + fileName + "\"", viewer); //$NON-NLS-1$
contentAssistant = getContentAssistantInternal();
//(config == null ? null : config.getContentAssistant(viewer));
-
- assertTrue(
+
+ // Fix for JBIDE-12261: Since WTP 3.4 the Content Assistant is made to properly use
+ // autoinsertion property value, so this fact affected the collecting of the proposals
+ // in case of a single proposal is returned
+ if (contentAssistant instanceof ContentAssistant) {
+ ((ContentAssistant) contentAssistant).enableAutoInsert(false);
+ }
+ assertNotNull(
"Cannot get the Content Assistant instance for the editor for page \"" //$NON-NLS-1$
- + fileName + "\"", (contentAssistant != null)); //$NON-NLS-1$
+ + fileName + "\"", contentAssistant); //$NON-NLS-1$
}
@@ -195,7 +204,7 @@
replacementString = Utils.trimQuotes(replacementString);
if (replacementString.equalsIgnoreCase(proposalName)) return compareImages(image, proposals[i]);
- } else {
+ } else {
if(proposals[i].getDisplayString().toLowerCase().equals(proposalName.toLowerCase())) return compareImages(image, proposals[i]);
}
}
@@ -216,6 +225,9 @@
.getActivePage().closeEditor(editorPart, false);
editorPart = null;
}
+ viewer = null;
+ document = null;
+ contentAssistant = null;
}
/**
13 years, 3 months
JBoss Tools SVN: r42249 - trunk/build/aggregate/local-site.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-06-27 13:05:09 -0400 (Wed, 27 Jun 2012)
New Revision: 42249
Modified:
trunk/build/aggregate/local-site/compositeArtifacts.xml
trunk/build/aggregate/local-site/compositeContent.xml
Log:
removed references to components removed from repository
Modified: trunk/build/aggregate/local-site/compositeArtifacts.xml
===================================================================
--- trunk/build/aggregate/local-site/compositeArtifacts.xml 2012-06-27 16:37:15 UTC (rev 42248)
+++ trunk/build/aggregate/local-site/compositeArtifacts.xml 2012-06-27 17:05:09 UTC (rev 42249)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1306350337000'/>
+<property name='p2.timestamp' value='1306350337001'/>
</properties>
<children size='31'>
@@ -38,16 +38,15 @@
<child location='../../../portlet/site/target/repository/'/>
<child location='../../../runtime/site/target/repository/'/>
<child location='../../../seam/site/target/repository/'/>
-<child location='../../../smooks/site/target/repository/'/>
<child location='../../../struts/site/target/repository/'/>
-
<child location='../../../tests/site/target/repository/'/>
+
<child location='../../../usage/site/target/repository/'/>
<child location='../../../vpe/site/target/repository/'/>
<child location='../../../ws/site/target/repository/'/>
<child location='../../../xulrunner/site/target/repository/'/>
-
<child location='../../../openshift/site/target/repository/'/>
+
<child location='../../../central/site/target/site/'/>
</children>
Modified: trunk/build/aggregate/local-site/compositeContent.xml
===================================================================
--- trunk/build/aggregate/local-site/compositeContent.xml 2012-06-27 16:37:15 UTC (rev 42248)
+++ trunk/build/aggregate/local-site/compositeContent.xml 2012-06-27 17:05:09 UTC (rev 42249)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1306350337000'/>
+<property name='p2.timestamp' value='1306350337001'/>
</properties>
<children size='31'>
@@ -38,16 +38,15 @@
<child location='../../../portlet/site/target/repository/'/>
<child location='../../../runtime/site/target/repository/'/>
<child location='../../../seam/site/target/repository/'/>
-<child location='../../../smooks/site/target/repository/'/>
<child location='../../../struts/site/target/repository/'/>
-
<child location='../../../tests/site/target/repository/'/>
+
<child location='../../../usage/site/target/repository/'/>
<child location='../../../vpe/site/target/repository/'/>
<child location='../../../ws/site/target/repository/'/>
<child location='../../../xulrunner/site/target/repository/'/>
-
<child location='../../../openshift/site/target/repository/'/>
+
<child location='../../../central/site/target/site/'/>
</children>
13 years, 3 months