JBoss Tools SVN: r35421 - in trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED: zz_DEPRECATED_helios_orbit and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-06 10:34:10 -0400 (Thu, 06 Oct 2011)
New Revision: 35421
Removed:
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
Log:
remove deprecated cruft
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1 +0,0 @@
-*~
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,18 +0,0 @@
-DEPRECATED. SEE ../helios/build.xml for a better mirror method.
-
----
-
-To rsync a mirror from eclipse.org to here, do the following:
-
-1. ssh to qa01, then sudo to hudson:
-
-$ ssh nboldt(a)qa01.qa.atl2.redhat.com
-$ sudo su - hudson
-
-2. rsync build.eclipse.org to reports.qa:
-
-$ rsync -aP --delete nickb@build.eclipse.org:~/downloads/releases/helios/* /qa/services/http/binaries/RHDS/updates/requirements/helios/
-
-3. rsync reports.qa to download.jboss.org:
-
-$ rsync -aP --delete /qa/services/http/binaries/RHDS/updates/requirements/helios/* tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/requirements/helios/
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1 +0,0 @@
-*~
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools - Helios + Orbit Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1295908416000'/>
-</properties>
-<children size='2'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/20100623...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools - Helios + Orbit Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1295908416000'/>
-</properties>
-<children size='2'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/20100623...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,6 +0,0 @@
-This URL is deprecated. Moved to the URL below.
-
-<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/'/>
-</children>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Helios Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1299020743000'/>
-</properties>
-<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Helios Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1299020743000'/>
-</properties>
-<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,6 +0,0 @@
-This URL is deprecated. Moved to the URL below.
-
-<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...'/>
-</children>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Helios Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1299020743000'/>
-</properties>
-<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Helios Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1299020743000'/>
-</properties>
-<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,6 +0,0 @@
-This URL is deprecated. Moved to the URL below.
-
-<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2/'/>
-</children>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Helios Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1299020743000'/>
-</properties>
-<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2/'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 13:56:05 UTC (rev 35420)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/zz_DEPRECATED/zz... 2011-10-06 14:34:10 UTC (rev 35421)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Helios Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1299020743000'/>
-</properties>
-<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2/'/>
-</children>
-</repository>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35420 - trunk/download.jboss.org/jbosstools/updates/requirements.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-06 09:56:05 -0400 (Thu, 06 Oct 2011)
New Revision: 35420
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/mirror.sh.txt
Log:
update the mirror script to allow more cmdline params to be passed through
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/mirror.sh.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mirror.sh.txt 2011-10-06 13:43:31 UTC (rev 35419)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mirror.sh.txt 2011-10-06 13:56:05 UTC (rev 35420)
@@ -3,7 +3,7 @@
destfolder=`pwd`
scriptname=${destfolder}/build.xml
-if [[ $# -lt 1 ]]; then
+if [[ $# -lt 1 ]] || [[ $1 == "." ]]; then
echo "Usage: $0 <scriptname> <destfolder>"
echo "Usage: $0 - (to use defaults of build.xml and .)"
exit
@@ -13,12 +13,9 @@
if [[ $2 ]]; then destfolder=$2; fi
fi
fi
-#export JAVA_HOME=/opt/jdk1.6.0; # old path on qa01
-export JAVA_HOME=$HOME/bin/sun-java2-6.0; # new path on dev01 - download Sun JDK 6 SE (.bin) and unpack into ~/bin/, then symlink as sun-java2-6.0
+export JAVA_HOME=$HOME/bin/sun-java2-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 $scriptname -Ddestination=$destfolder -Declipse.p2.mirrors=false $3 $4 $5
+#${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 $scriptname -Ddestination=$destfolder -Declipse.p2.mirrors=true
-${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 $scriptname -Ddestination=$destfolder -Declipse.p2.mirrors=false
-
# cleanup
-if [[ $? -eq 0 ]]; then
- rm -fr $TMP
-fi
+rm -fr $TMP
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35419 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-06 09:43:31 -0400 (Thu, 06 Oct 2011)
New Revision: 35419
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
update versions of features/plugins in TPs to Indigo SR1 levels
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-10-06 11:33:37 UTC (rev 35418)
+++ trunk/build/target-platform/jbds.target 2011-10-06 13:43:31 UTC (rev 35419)
@@ -24,12 +24,12 @@
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client" version="1.6.3.201106061504"/>
- <unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201108040830"/>
+ <unit id="org.jboss.netty" version="3.2.4.Final-201108040830"/>
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
- <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.1.v20110818-0811"/>
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
@@ -63,15 +63,15 @@
<unit id="org.apache.lucene.spellchecker" version="2.9.1.v20100421-0704"/>
<!-- CVS -->
- <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7I8H58WG5"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHk8sF7BB7VAH5AYC5"/>
<!-- DTP 1.9 -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBHCBYKYEbNV"/>
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8hEt1ZwmrIjglSM8CoR_Bu4"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7GCcNBHHBcIeEcQb"/>
- <unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
+ <unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.1.v201108301820-4117w312219371456"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7BCcNBGMDPHiDYRL"/>
- <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6z-2z-hgOTs0y-rHcC"/>
+ <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.1.v201108301820-7J9B7FBWwVN7-2z-kZU_tJy1aR1t"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788eBmKDOGMeK0J2Ok7QBR"/>
<unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.0.v201010181130-67D0AqGBJVKbHlH1GU7QBR"/>
<unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.9.0.v201010181130-7F47SFC7sRbrSZope9vW"/>
@@ -79,27 +79,27 @@
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.0.v201010181130-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/>
<unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>
- <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFF_GlGgJU"/>
+ <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.1.v201108301820-7A7T78DZRDKGEeHnGlLP"/>
<unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s735357795A8D"/>
- <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/>
+ <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.1.v201108301820-548dAkF79Q7RAN9UFJ"/>
<unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.0.v201010181130-542AkF77g7V9N9e77"/>
<unit id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.9.0.v201010181130-540AkF77g7V9N9e77"/>
- <unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.9.0.v201010181130-7E45F9NiNZVR6a1PMVn"/>
+ <unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.9.1.v201108301820-7E45F9NiNZVR6a1PMVn"/>
<unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.0.v201010181130-540AkF78Y7VCOCQDB"/>
<unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.0.v201010181130-541AkF79P7N8NAQ77"/>
<unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJvPRskDVIMJ0T"/>
- <unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.0.v201101201115-57B3AkF7AJ7KCEBLBI"/>
- <unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.0.v201010181130-7A-3F7RZHLz-Hz-OlPz0Qf"/>
+ <unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.1.v201108301820-57B4AkF7AJ7NCBBMBL"/>
+ <unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.1.v201108301820-7A-3F7RZHLz-Hz-OlPz0Qf"/>
<unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.0.v201010181130-278-78B04G8S_IMz00Iz00PmQz01"/>
<unit id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.9.0.v201010181130-642BgJ9DJAQGVCaIQ"/>
<unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.9.0.v201010181130-622BgJ9CR9XFcEWLP"/>
- <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.9.0.v201010181130-79-4EVVFJoFwKcN-L_"/>
- <unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.9.0.v201010181130-4208375LG5BJ93413"/>
+ <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.9.1.v201108301820-79-4EVVFJoFwKcN-L_"/>
+ <unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.9.1.v201108301820-4208375LG5BJ93413"/>
<unit id="org.eclipse.datatools.intro.feature.group" version="1.9.0.v201010181130-26-7w312116392911"/>
<unit id="org.eclipse.datatools.doc.user.feature.group" version="1.9.0.v201010181130-47C08w95ENAK6AFDFK7"/>
- <unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.9.0.v201010181130-26-311A16321A3557"/>
+ <unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.9.1.v201108301820-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
@@ -107,24 +107,24 @@
<unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20110530-1010"/>
<unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20110530-1010"/>
<unit id="org.eclipse.xsd.editor.feature.group" version="2.7.0.v20110530-1010"/>
- <unit id="org.eclipse.xsd.mapping.editor.feature.group" version="2.6.0.v20110310-1804"/>
- <unit id="org.eclipse.xsd.mapping.feature.group" version="2.7.0.v20110530-1010"/>
- <unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20110530-1010"/>
+ <unit id="org.eclipse.xsd.mapping.editor.feature.group" version="2.7.0.v20111003-1135"/>
+ <unit id="org.eclipse.xsd.mapping.feature.group" version="2.7.0.v20111003-1135"/>
+ <unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20111003-1135"/>
<!-- EMF 2.7 + others -->
<unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110524-0815"/>
- <unit id="org.eclipse.emf.feature.group" version="2.7.0.v20110530-1010"/>
+ <unit id="org.eclipse.emf.feature.group" version="2.7.1.v20111003-1135"/>
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
<unit id="org.eclipse.emf.validation.feature.group" version="1.5.0.v20110502-1600-479-9oB56N5BBR6LCA6"/>
<unit id="org.eclipse.emf.transaction.feature.group" version="1.5.0.v20110502-1600-377-8s734C3E7D15D6B"/>
<!-- GEF 3.7 -->
- <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20110425-2050-46-7w3122153603161"/>
+ <unit id="org.eclipse.draw2d.feature.group" version="3.7.1.v20110830-1143-4607w3122194102254"/>
<unit id="org.eclipse.gef.feature.group" version="3.7.0.v20110425-2050-777D-81B2Bz0685C3A6E34272"/>
<unit id="org.eclipse.zest.feature.group" version="1.3.0.v20101213-1100-67A-8yF4F09A9H4D6O54272"/>
<!-- JDT 3.7 -->
- <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110520-0800-7z8gFchFMTdFYKuLqBLqRja9B15B"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcoFMLfTabvKsR5Qm9rBGEBK"/>
<!-- WTP SDK 3.3 -->
<unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.1.v201108080010-6-0AkF7BB7S9N7788"/>
@@ -175,13 +175,13 @@
<!-- RCP 3.7 -->
<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110530-7P7NFUFFLWUl76mart"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.0.v20110228-897TFncFdHjO2qRuCh_UvYT"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bj9JXOeQxOURYC-l9BL7rDEQO7"/>
<unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
- <unit id="org.eclipse.platform.feature.group" version="3.7.0.v20110530-9gF7UHNFFt4cwE-pkZDJ7oz-mj4OSEIlu9SEv0f"/>
- <unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5FiuFpBGyHd2xA_SWnfP"/>
+ <unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHOxFtniV7mI3T556iZN9AU8bEZ1lHMcVK"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmNFnFLSFCtLxnRfMqt15A4A"/>
<!-- UML -->
- <unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201101271655"/>
+ <unit id="org.eclipse.uml2.feature.group" version="3.2.1.v201109082252"/>
<unit id="org.eclipse.uml2.doc.feature.group" version="3.2.0.v201103291514"/>
<!-- PDE -->
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-10-06 11:33:37 UTC (rev 35418)
+++ trunk/build/target-platform/multiple.target 2011-10-06 13:43:31 UTC (rev 35419)
@@ -84,17 +84,17 @@
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
<unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="4.0.0.v20101008-79--87aC-AFJ6i5OwkX7DtDlQnz-"/>
+ <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.0.v20110905-777D186vH9ByS6g9QJbm7yp7gZp-"/>
<unit id="org.eclipse.birt.feature.group" version="4.0.0.v20101013-CJ8h7AGS7-BwX_RBv07XxGDko6kN"/>
<unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.0.v20110523-2201-46-7w3122163403312"/>
<unit id="org.eclipse.birt.chart.feature.group" version="4.0.0.v20101008-828L1FQCnvKA7YW2lWF7"/>
- <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="4.0.0.v20110130-1818-5--7w3122124102929"/>
+ <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.1.v20110905-1820-4607w31221A1602931"/>
<unit id="com.ibm.icu.base.feature.group" version="1.2.0.v20110302-797738s7355373J"/>
- <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.0.v20110502-7K7TFBVF7RZHQQHz-Ld02A66"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFBYDzbeA3ypK_98cDL15A4A"/>
<unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7I8H58WG5"/>
<unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
<unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110208-0800-7z8gFb7FMTfEULpkdZIlQtX9H155"/>
@@ -104,72 +104,72 @@
<unit id="org.eclipse.platform.sdk" version="3.7.0.I20110310-1119"/>
<unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110121-7b7oFXNFEx2Xmp_WfY574C"/>
<unit id="org.eclipse.sdk.feature.group" version="3.7.0.v20110121-7Q7xA7DPa2z-lGjJRd0f6hRgSZ1DWdaZTRWbk_SVSlVqV"/>
- <unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110123-45-7w31212215"/>
+ <unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110503-4507s482aw31221929"/>
<unit id="org.eclipse.sdk.ide" version="3.7.0.I20110613-1736"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.4.0.v20110503-817mFcfFEdccNcRhh8BTgNN"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.4.0.v20110121"/>
- <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.0.v20110124-7X7XG6sFPGjtJ53kGX13J93"/>
+ <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.1.R37x_v20110909-7X7XGA3FNKoMz-UVh-nB7ZBJ"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110506-0800-7uF9LFp7FWmE7gTBiKg15LDD"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20110519-4-8_9oB5885K5B28WKK"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.0.v20110228-897TFncFdHjO2qRuCh_UvYT"/>
- <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.0.v20110124-9J7kHABGKUf0qkz-nObV98021383"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bj9JXOeQxOURYC-l9BL7rDEQO7"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.1.R37x_v20110907-9N7sHDOGKQr_bhQlOXRnwJn5DsVZ"/>
<unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.0.v20110124-7u7PFlsFN5Jgisd_JUErPMnpRcX2"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.0.v20110502-7M7W8Z8eNV4UqfbhicjDN-ROgjNc"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.100.v20110502-79-F8PEVVFNNFsFV"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110124-7I77AqBgJ9EBBNBb8IAD"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.0.v20110124-7x7PFRBFT0z0-VD5xYnTNoi1"/>
- <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.100.v20110123-7C-7BF9JgLWLMBMMAMsLL"/>
+ <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.200.r37x_v20110803-7D-FHkFAFkNZZO9PfBZStN"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110124-42Bg9oB5856H5F"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110124-0830-44Eo8s7353574H2531"/>
<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5Fm1FpBGy_AaVz-mFamgY"/>
<!-- DTP 1.9 -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBHCBYKYEbNV"/>
- <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"/>
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.1.v201108301820-7C7e8mEt1_wmuQjYnXQ6Zj5dM17"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7ACcNBGLEOIeD_WM"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIax-vy-Mg9L"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788dBmKDNOMgJvJ8Of7QBR"/>
- <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.0.v201010181130-67D0AqGBJVKbHlH1GU7QBR"/>
+ <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.1.v201108301820-67D1AqGBKNKdIlGz0GU7QBR"/>
<unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.9.0.v201010181130-7F47SFC7sRbrSZope9vW"/>
<unit id="org.eclipse.datatools.enablement.jdbc.feature.feature.group" version="1.9.0.v201010181130-4-29oB56N5N7L6PAQ"/>
- <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.0.v201010181130-2-07w31211518181A"/>
+ <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.1.v201108301820-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/>
<unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>
- <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFF_GlGgJU"/>
+ <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.1.v201108301820-7A7T78DZRDKGEeHnGlLP"/>
<unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s735357795A8D"/>
- <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/>
- <unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.0.v201010181130-542AkF77g7V9N9e77"/>
+ <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.1.v201108301820-548dAkF79Q7RAN9UFJ"/>
+ <unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.1.v201108301820-542AkF77g7V9N9e77"/>
<unit id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.9.0.v201010181130-540AkF77g7V9N9e77"/>
- <unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.9.0.v201010181130-7E45F9NiNZVR6a1PMVn"/>
- <unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.0.v201010181130-540AkF78Y7VCOCQDB"/>
- <unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.0.v201010181130-541AkF79P7N8NAQ77"/>
+ <unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.9.1.v201108301820-7E45F9NiNZVR6a1PMVn"/>
+ <unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.1.v201108301820-540AkF78Z7UCRAQDB"/>
+ <unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.1.v201108301820-541AkF79P7N8NAQ77"/>
<unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJvPRskDVIMJ0T"/>
<unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.0.v201101201115-57B3AkF7AI8FDDAOCP"/>
- <unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.0.v201010181130-7A-3F7RZHLz-Hz-OlPz0Qf"/>
+ <unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.1.v201108301820-7A-3F7RZHLz-Hz-OlPz0Qf"/>
<unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.0.v201010181130-278-78B04G8S_IMz00Iz00PmQz01"/>
<unit id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.9.0.v201010181130-642BgJ9DJAQGVCaIQ"/>
<unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.9.0.v201010181130-622BgJ9CR9XFcEWLP"/>
- <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.9.0.v201010181130-79-4EVVFJoFwKcN-L_"/>
+ <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.9.1.v201108301820-79-4EVVFJoFwKcN-L_"/>
<unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.9.0.v201010181130-4208375LG5BJ93413"/>
<unit id="org.eclipse.datatools.intro.feature.group" version="1.9.0.v201010181130-26-7w312116392911"/>
<unit id="org.eclipse.datatools.doc.user.feature.group" version="1.9.0.v201010181130-47C08w95ENAK6AFDFK7"/>
- <unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.9.0.v201010181130-26-311A16321A3557"/>
+ <unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.9.1.v201108301820-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20110425-2050-46-7w3122153603161"/>
- <unit id="org.eclipse.gef.feature.group" version="3.7.0.v20110425-2050-777D-81B2Bz0685C3A6E34272"/>
- <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20101213-1100-67A-8yF4F0997J4B8O54272"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.7.1.v20110830-1143-777D181B3Bz06C853D8863365"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20110425-2050-67A08yF5F18CBD4I9G53365"/>
<unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201101271655"/>
<unit id="org.eclipse.rse.feature.group" version="3.3.0.v201105231230-7L7CFGB8wqio7ppp-b5xwz-6LVIZ"/>
- <unit id="org.eclipse.rse.ssh.feature.group" version="3.0.300.v201101042155-7A3F9wAkF7BB7C7KDJNN"/>
+ <unit id="org.eclipse.rse.ssh.feature.group" version="3.0.301.R33x_v201109141647-7A3F9xAGGB5k0C7KEATN92641"/>
<unit id="org.eclipse.rse.terminals.feature.group" version="1.1.0.v201101042155-771Bg9uD6I4AB9LECPS3A45"/>
- <unit id="org.eclipse.rse.telnet.feature.group" version="2.2.200.v201103142315-775F8NAkF7BB7B9NEIPP"/>
+ <unit id="org.eclipse.rse.telnet.feature.group" version="2.2.200.v201106011538-775F8NAkF7BB7B9NEIPP"/>
<unit id="org.eclipse.rse.ftp.feature.group" version="3.0.300.v201101261515-782F8N9oB588587HAFII"/>
<unit id="org.eclipse.rse.local.feature.group" version="2.1.300.v201101042155-7B4FKsBgJ9EE9F9QHMUU"/>
<unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/>
@@ -207,7 +207,7 @@
<unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.1.v201108080010-6-0AkF7BB7S9N7788"/>
<unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.1.v201108080010-3-08s73553F3G3343"/>
<unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb"/>
- <unit id="org.eclipse.persistence.jpa.feature.group" version="2.3.0.v20110521-r9438"/>
+ <unit id="org.eclipse.persistence.jpa.feature.group" version="2.3.1.v20110908-r10021"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201102150115-377DF8s7355397B4B9B"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201008062100-7b7IHsyFSK2WCyUz0B1kvyUYCPoM"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201010270400-7O7IFhJEMi9DuyLKBtQnDL7h6CJz"/>
@@ -245,7 +245,7 @@
<unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/>
<unit id="com.jcraft.jsch" version="0.1.41.v201101211617"/>
<unit id="org.eclipse.jgit.feature.group" version="1.0.0.201106090707-r"/>
- <unit id="org.eclipse.egit.feature.group" version="1.0.0.201106090707-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="1.1.0.201109151100-r"/>
</location>
</locations>
<includeBundles>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-10-06 11:33:37 UTC (rev 35418)
+++ trunk/build/target-platform/unified.target 2011-10-06 13:43:31 UTC (rev 35419)
@@ -19,19 +19,19 @@
<!-- m2e 1.0 / m2e-wtp 0.13.1.20110718-1012 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201103291237"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.1.20110728-1800"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.14.0.201107260131"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client" version="1.6.3.20110315-1708"/>
- <unit id="org.jboss.netty" version="3.2.4.Final"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110118-1616"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201106061504"/>
+ <unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100920"/>
- <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110128-1111"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
@@ -84,17 +84,17 @@
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
<unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="4.0.0.v20101008-79--87aC-AFJ6i5OwkX7DtDlQnz-"/>
+ <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.0.v20110905-777D186vH9ByS6g9QJbm7yp7gZp-"/>
<unit id="org.eclipse.birt.feature.group" version="4.0.0.v20101013-CJ8h7AGS7-BwX_RBv07XxGDko6kN"/>
<unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.0.v20110523-2201-46-7w3122163403312"/>
<unit id="org.eclipse.birt.chart.feature.group" version="4.0.0.v20101008-828L1FQCnvKA7YW2lWF7"/>
- <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="4.0.0.v20110130-1818-5--7w3122124102929"/>
+ <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.1.v20110905-1820-4607w31221A1602931"/>
<unit id="com.ibm.icu.base.feature.group" version="1.2.0.v20110302-797738s7355373J"/>
- <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.0.v20110502-7K7TFBVF7RZHQQHz-Ld02A66"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFBYDzbeA3ypK_98cDL15A4A"/>
<unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7I8H58WG5"/>
<unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
<unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110208-0800-7z8gFb7FMTfEULpkdZIlQtX9H155"/>
@@ -104,72 +104,72 @@
<unit id="org.eclipse.platform.sdk" version="3.7.0.I20110310-1119"/>
<unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110121-7b7oFXNFEx2Xmp_WfY574C"/>
<unit id="org.eclipse.sdk.feature.group" version="3.7.0.v20110121-7Q7xA7DPa2z-lGjJRd0f6hRgSZ1DWdaZTRWbk_SVSlVqV"/>
- <unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110123-45-7w31212215"/>
+ <unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110503-4507s482aw31221929"/>
<unit id="org.eclipse.sdk.ide" version="3.7.0.I20110613-1736"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.4.0.v20110503-817mFcfFEdccNcRhh8BTgNN"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.4.0.v20110121"/>
- <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.0.v20110124-7X7XG6sFPGjtJ53kGX13J93"/>
+ <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.1.R37x_v20110909-7X7XGA3FNKoMz-UVh-nB7ZBJ"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110506-0800-7uF9LFp7FWmE7gTBiKg15LDD"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20110519-4-8_9oB5885K5B28WKK"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.0.v20110228-897TFncFdHjO2qRuCh_UvYT"/>
- <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.0.v20110124-9J7kHABGKUf0qkz-nObV98021383"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bj9JXOeQxOURYC-l9BL7rDEQO7"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.1.R37x_v20110907-9N7sHDOGKQr_bhQlOXRnwJn5DsVZ"/>
<unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.0.v20110124-7u7PFlsFN5Jgisd_JUErPMnpRcX2"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.0.v20110502-7M7W8Z8eNV4UqfbhicjDN-ROgjNc"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.100.v20110502-79-F8PEVVFNNFsFV"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110124-7I77AqBgJ9EBBNBb8IAD"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.0.v20110124-7x7PFRBFT0z0-VD5xYnTNoi1"/>
- <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.100.v20110123-7C-7BF9JgLWLMBMMAMsLL"/>
+ <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.200.r37x_v20110803-7D-FHkFAFkNZZO9PfBZStN"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110124-42Bg9oB5856H5F"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110124-0830-44Eo8s7353574H2531"/>
<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5Fm1FpBGy_AaVz-mFamgY"/>
<!-- DTP 1.9 -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBHCBYKYEbNV"/>
- <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"/>
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.1.v201108301820-7C7e8mEt1_wmuQjYnXQ6Zj5dM17"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7ACcNBGLEOIeD_WM"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIax-vy-Mg9L"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788dBmKDNOMgJvJ8Of7QBR"/>
- <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.0.v201010181130-67D0AqGBJVKbHlH1GU7QBR"/>
+ <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.1.v201108301820-67D1AqGBKNKdIlGz0GU7QBR"/>
<unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.9.0.v201010181130-7F47SFC7sRbrSZope9vW"/>
<unit id="org.eclipse.datatools.enablement.jdbc.feature.feature.group" version="1.9.0.v201010181130-4-29oB56N5N7L6PAQ"/>
- <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.0.v201010181130-2-07w31211518181A"/>
+ <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.1.v201108301820-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/>
<unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>
- <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFF_GlGgJU"/>
+ <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.1.v201108301820-7A7T78DZRDKGEeHnGlLP"/>
<unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s735357795A8D"/>
- <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/>
- <unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.0.v201010181130-542AkF77g7V9N9e77"/>
+ <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.1.v201108301820-548dAkF79Q7RAN9UFJ"/>
+ <unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.1.v201108301820-542AkF77g7V9N9e77"/>
<unit id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.9.0.v201010181130-540AkF77g7V9N9e77"/>
- <unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.9.0.v201010181130-7E45F9NiNZVR6a1PMVn"/>
- <unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.0.v201010181130-540AkF78Y7VCOCQDB"/>
- <unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.0.v201010181130-541AkF79P7N8NAQ77"/>
+ <unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.9.1.v201108301820-7E45F9NiNZVR6a1PMVn"/>
+ <unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.1.v201108301820-540AkF78Z7UCRAQDB"/>
+ <unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.1.v201108301820-541AkF79P7N8NAQ77"/>
<unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJvPRskDVIMJ0T"/>
<unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.0.v201101201115-57B3AkF7AI8FDDAOCP"/>
- <unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.0.v201010181130-7A-3F7RZHLz-Hz-OlPz0Qf"/>
+ <unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.1.v201108301820-7A-3F7RZHLz-Hz-OlPz0Qf"/>
<unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.0.v201010181130-278-78B04G8S_IMz00Iz00PmQz01"/>
<unit id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.9.0.v201010181130-642BgJ9DJAQGVCaIQ"/>
<unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.9.0.v201010181130-622BgJ9CR9XFcEWLP"/>
- <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.9.0.v201010181130-79-4EVVFJoFwKcN-L_"/>
+ <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.9.1.v201108301820-79-4EVVFJoFwKcN-L_"/>
<unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.9.0.v201010181130-4208375LG5BJ93413"/>
<unit id="org.eclipse.datatools.intro.feature.group" version="1.9.0.v201010181130-26-7w312116392911"/>
<unit id="org.eclipse.datatools.doc.user.feature.group" version="1.9.0.v201010181130-47C08w95ENAK6AFDFK7"/>
- <unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.9.0.v201010181130-26-311A16321A3557"/>
+ <unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.9.1.v201108301820-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20110425-2050-46-7w3122153603161"/>
- <unit id="org.eclipse.gef.feature.group" version="3.7.0.v20101213-1100-777D-81B2Bz0656B376H34272"/>
- <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20101213-1100-67A-8yF4F0997J4B8O54272"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.7.1.v20110830-1143-777D181B3Bz06C853D8863365"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20110425-2050-67A08yF5F18CBD4I9G53365"/>
<unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201101271655"/>
<unit id="org.eclipse.rse.feature.group" version="3.3.0.v201105231230-7L7CFGB8wqio7ppp-b5xwz-6LVIZ"/>
- <unit id="org.eclipse.rse.ssh.feature.group" version="3.0.300.v201101042155-7A3F9wAkF7BB7C7KDJNN"/>
+ <unit id="org.eclipse.rse.ssh.feature.group" version="3.0.301.R33x_v201109141647-7A3F9xAGGB5k0C7KEATN92641"/>
<unit id="org.eclipse.rse.terminals.feature.group" version="1.1.0.v201101042155-771Bg9uD6I4AB9LECPS3A45"/>
- <unit id="org.eclipse.rse.telnet.feature.group" version="2.2.200.v201103142315-775F8NAkF7BB7B9NEIPP"/>
+ <unit id="org.eclipse.rse.telnet.feature.group" version="2.2.200.v201106011538-775F8NAkF7BB7B9NEIPP"/>
<unit id="org.eclipse.rse.ftp.feature.group" version="3.0.300.v201101261515-782F8N9oB588587HAFII"/>
<unit id="org.eclipse.rse.local.feature.group" version="2.1.300.v201101042155-7B4FKsBgJ9EE9F9QHMUU"/>
<unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/>
@@ -207,7 +207,7 @@
<unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.1.v201108080010-6-0AkF7BB7S9N7788"/>
<unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.1.v201108080010-3-08s73553F3G3343"/>
<unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb"/>
- <unit id="org.eclipse.persistence.jpa.feature.group" version="2.3.0.v20110521-r9438"/>
+ <unit id="org.eclipse.persistence.jpa.feature.group" version="2.3.1.v20110908-r10021"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201102150115-377DF8s7355397B4B9B"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201008062100-7b7IHsyFSK2WCyUz0B1kvyUYCPoM"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201010270400-7O7IFhJEMi9DuyLKBtQnDL7h6CJz"/>
@@ -245,7 +245,7 @@
<unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/>
<unit id="com.jcraft.jsch" version="0.1.41.v201101211617"/>
<unit id="org.eclipse.jgit.feature.group" version="1.0.0.201106090707-r"/>
- <unit id="org.eclipse.egit.feature.group" version="1.0.0.201106090707-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="1.1.0.201109151100-r"/>
</location>
</locations>
<includeBundles>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35418 - in trunk/common/plugins: org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-06 07:33:37 -0400 (Thu, 06 Oct 2011)
New Revision: 35418
Added:
trunk/common/plugins/org.jboss.tools.common.jdt.ui/icons/
trunk/common/plugins/org.jboss.tools.common.jdt.ui/icons/jar_obj.gif
trunk/common/plugins/org.jboss.tools.common.jdt.ui/icons/projects.gif
Modified:
trunk/common/plugins/org.jboss.tools.common.jdt.ui/build.properties
trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/JDTExtUIActivator.java
trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java
trunk/common/plugins/org.jboss.tools.common.jdt/build.properties
trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java
Log:
JBIDE-8972 : Fixed icons and added button to select the destination folder
Modified: trunk/common/plugins/org.jboss.tools.common.jdt/build.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt/build.properties 2011-10-06 11:32:37 UTC (rev 35417)
+++ trunk/common/plugins/org.jboss.tools.common.jdt/build.properties 2011-10-06 11:33:37 UTC (rev 35418)
@@ -4,3 +4,4 @@
.,\
plugin.xml,\
plugin.properties
+src.includes = src/
Modified: trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java 2011-10-06 11:32:37 UTC (rev 35417)
+++ trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java 2011-10-06 11:33:37 UTC (rev 35418)
@@ -1,3 +1,13 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2011 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
package org.jboss.tools.common.jdt.core.buildpath;
import java.io.File;
@@ -6,7 +16,6 @@
import java.util.LinkedHashSet;
import java.util.Map;
-import org.apache.commons.io.FileUtils;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
@@ -26,6 +35,7 @@
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.jdt.core.JDTExtActivator;
import org.jboss.tools.common.jdt.core.Messages;
+import org.jboss.tools.common.util.FileUtil;
public class MaterializeLibraryJob extends WorkspaceJob {
@@ -186,7 +196,7 @@
if (sourcefile.isFile()) {
File destinationFile = destinationFilePath.toFile();
//Overwrite existing file
- FileUtils.copyFile(sourcefile, destinationFile);
+ FileUtil.copyFile(sourcefile, destinationFile);
if (destinationFile.exists()) {
return true;
}
Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/build.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt.ui/build.properties 2011-10-06 11:32:37 UTC (rev 35417)
+++ trunk/common/plugins/org.jboss.tools.common.jdt.ui/build.properties 2011-10-06 11:33:37 UTC (rev 35418)
@@ -3,4 +3,6 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ icons/
+src.includes = src/
Added: trunk/common/plugins/org.jboss.tools.common.jdt.ui/icons/jar_obj.gif
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.jdt.ui/icons/jar_obj.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.jdt.ui/icons/projects.gif
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.jdt.ui/icons/projects.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/JDTExtUIActivator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/JDTExtUIActivator.java 2011-10-06 11:32:37 UTC (rev 35417)
+++ trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/JDTExtUIActivator.java 2011-10-06 11:33:37 UTC (rev 35418)
@@ -12,6 +12,8 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -68,4 +70,22 @@
.getLocalizedMessage(), e);
plugin.getLog().log(status);
}
+
+ public static Image getJarIcon() {
+ return getIcon("icons/jar_obj.gif");
+ }
+
+ public static Image getProjectIcon() {
+ return getIcon("icons/projects.gif");
+ }
+
+ public static Image getIcon(String pathToIcon) {
+ Image img = null;
+ ImageDescriptor descriptor = imageDescriptorFromPlugin(PLUGIN_ID, pathToIcon);
+ if(descriptor != null) {
+ img = descriptor.createImage();
+ }
+ return img;
+ }
+
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java 2011-10-06 11:32:37 UTC (rev 35417)
+++ trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java 2011-10-06 11:33:37 UTC (rev 35418)
@@ -26,28 +26,23 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathContainer;
import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CellLabelProvider;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
-import org.eclipse.jface.viewers.ICellEditorValidator;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.window.ToolTip;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -59,10 +54,12 @@
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ContainerSelectionDialog;
+import org.jboss.tools.common.jdt.ui.JDTExtUIActivator;
public class MaterializeLibraryDialog extends TitleAreaDialog {
- private static final String TITLE = "Materialize Classpath Library";
+ private static final String TITLE = "Materialize ";
private static final String SOURCE_PROPERTY = "SOURCE_PROPERTY";
@@ -73,10 +70,9 @@
private Map<IPath, String> selectedClasspathEntryPaths;
private final String libName;
- private final IProject project;
- private static Image JAR_IMAGE = JavaPluginImages.DESC_OBJS_EXTJAR.createImage();
- private static Image PRJ_IMAGE = JavaPluginImages.DESC_OBJS_JAVA_MODEL.createImage();
+ private Image jarImage;
+ private Image projectImage;
// private StringButtonDialogField libFolderDialogField;
@@ -87,11 +83,9 @@
public MaterializeLibraryDialog(Shell shell, IProject project, IClasspathContainer containerToMaterialize, String defaultLib) {
super(shell);
setShellStyle(super.getShellStyle() | SWT.RESIZE | SWT.MODELESS);
- setTitle(TITLE);
- this.project = project;
+ this.libName = containerToMaterialize.getDescription();
IPath folderPath = project.getFullPath().append(defaultLib);
libFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(folderPath);
- this.libName = containerToMaterialize.getDescription();
initClasspathEntryPaths(containerToMaterialize);
}
@@ -111,11 +105,21 @@
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
- shell.setText(TITLE);
+ shell.setText(TITLE + "Classpath Library");
}
+ private void initImages() {
+ jarImage =JDTExtUIActivator.getJarIcon();
+ projectImage= JDTExtUIActivator.getProjectIcon();
+ }
+
+
@Override
protected Control createDialogArea(Composite parent) {
+
+ initImages();
+ setTitle(TITLE + libName);
+
Composite area = (Composite) super.createDialogArea(parent);
Composite container = new Composite(area, SWT.NONE);
@@ -126,8 +130,7 @@
container.setLayout(layout);
container.setLayoutData(new GridData(GridData.FILL_BOTH));
- setTitle(TITLE);
- setMessage("Copy jars from " + libName);
+ setMessage("Copy selected jars from " + libName + " to the destination folder.");
// ContainerFieldAdapter adapter= new ContainerFieldAdapter();
// libFolderDialogField = new StringButtonDialogField(adapter);
@@ -143,16 +146,56 @@
libFolderLabel.setText("Destination folder");
libfolderText = new Text(container, SWT.BORDER);
- libfolderText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
+ libfolderText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
libfolderText.setEditable(true);
libfolderText.setText(libFolder.getFullPath().toPortableString());
+ libfolderText.addModifyListener(new ModifyListener() {
+ @Override
+ public void modifyText(ModifyEvent event) {
+ validate();
+ }
+ });
+ addSelectFolderButton(container);
// libFolderDialogField.setText(libFolder.getFullPath().toPortableString());
displayClasspathEntriesTable(container);
return area;
}
+ private void addSelectFolderButton(Composite container) {
+
+ Button button = new Button(container, SWT.NONE);
+ button.setLayoutData(new GridData(SWT.FILL, SWT.UP,
+ false, false, 1, 1));
+ button.setText("Select Folder");
+ button.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), getLibFolderFromText(libfolderText.getText()), true, "Select Destination Folder");
+ dialog.setTitle("Container Selection");
+ dialog.open();
+ Object[] result = dialog.getResult();
+ if (result != null && result[0] instanceof IPath) {
+ libfolderText.setText(((IPath)result[0]).toPortableString());
+ }
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+ }
+
+ @Override
+ public boolean close() {
+ if (jarImage != null) {
+ jarImage.dispose();
+ }
+ if (projectImage!= null) {
+ projectImage.dispose();
+ }
+ return super.close();
+ }
+
private void displayClasspathEntriesTable(Composite container) {
GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 4);
gd.heightHint = 500;
@@ -204,13 +247,13 @@
"EMPTY", SOURCE_PROPERTY, FILENAME_PROPERTY });
TextCellEditor ce = new TextCellEditor(classpathEntriesViewer.getTable());
- ce.setValidator(new ICellEditorValidator() {
- @Override
- public String isValid(Object arg0) {
- String name = arg0.toString();
- return (checkValidName(name))?null:name;
- }
- });
+// ce.setValidator(new ICellEditorValidator() {
+// @Override
+// public String isValid(Object arg0) {
+// String name = arg0.toString();
+// return (checkValidName(name))?null:name;
+// }
+// });
CellEditor[] editors = new CellEditor[] {
null,
@@ -237,29 +280,54 @@
@Override
protected void okPressed() {
+ if (!validate()) {
+ return;
+ }
libFolder = getLibFolderFromText(libfolderText.getText());
+ super.okPressed();
+ }
+
+ private boolean validate() {
+ boolean valid = validateLibFolder() && validateEntries();
+ if (valid) {
+ setErrorMessage(null);
+ }
+ return valid;
+ }
+
+ private boolean validateLibFolder() {
+ IFolder folder = getLibFolderFromText(libfolderText.getText());
+ String ancestorPath = folder.getFullPath().segment(0);
+ IResource ancestor = ResourcesPlugin.getWorkspace().getRoot().findMember(ancestorPath);
+ if (ancestor == null || !ancestor.exists()) {
+ setErrorMessage(ancestorPath + " does not exist ");
+ return false;
+ }
+ return true;
+ }
+
+ private boolean validateEntries() {
Object[] selection = classpathEntriesViewer.getCheckedElements();
selectedClasspathEntryPaths = new LinkedHashMap<IPath, String>(selection.length);
for (Object o : selection) {
@SuppressWarnings("unchecked")
Map.Entry<IClasspathEntry, String> entry = (Map.Entry<IClasspathEntry, String>)o;
+ if (entry.getKey().getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
+ String name = entry.getValue();
+ if (!checkValidName(name)) {
+ setErrorMessage(name + " is not a valid file name");
+ return false;
+ }
+ }
selectedClasspathEntryPaths.put(entry.getKey().getPath(),entry.getValue());
}
-
- String ancestorPath = libFolder.getFullPath().segment(0);
- IResource ancestor = ResourcesPlugin.getWorkspace().getRoot().findMember(ancestorPath);
- if (ancestor == null || !ancestor.exists()) {
- setErrorMessage(ancestorPath + " does not exist ");
- return;
- }
-
Set<String> duplicates = findDuplicates(selectedClasspathEntryPaths.values());
if (!duplicates.isEmpty()) {
setErrorMessage("Duplicate entries found : "+duplicates.toString());
- return;
+ return false;
}
- super.okPressed();
+ return true;
}
private Set<String> findDuplicates(Collection<String> values) {
@@ -298,9 +366,9 @@
if (columnIndex > 0) {
Map.Entry<IClasspathEntry, String> entry = (Map.Entry<IClasspathEntry, String>) element;
if (entry.getKey().getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- img = JAR_IMAGE;//return lib image
+ img = jarImage;
} else {
- img = PRJ_IMAGE;
+ img = projectImage;
}
}
return img;
@@ -356,10 +424,8 @@
Map.Entry<IClasspathEntry, String> entry = (Map.Entry<IClasspathEntry, String>) item.getData();
if(entry.getKey().getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
String name = value.toString();
- if (checkValidName(name)) {
- entry.setValue(name);
- setErrorMessage(null);
- }
+ entry.setValue(name);
+ validate();
classpathEntriesViewer.refresh();
}
}
@@ -375,7 +441,8 @@
if (!result.isOK()) {
return false;
}
- return (name.endsWith(".jar") || name.endsWith(".zip"));
+ return !name.contains("\\") &&
+ (name.endsWith(".jar") || name.endsWith(".zip"));
}
}
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35417 - in trunk/common/plugins: org.jboss.tools.common.jdt.ui/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-06 07:32:37 -0400 (Thu, 06 Oct 2011)
New Revision: 35417
Modified:
trunk/common/plugins/org.jboss.tools.common.jdt.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.jdt/META-INF/MANIFEST.MF
Log:
JBIDE-8972 : replaced dependency to apache commons-io FileUtils by the one from JBT commons
Modified: trunk/common/plugins/org.jboss.tools.common.jdt/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt/META-INF/MANIFEST.MF 2011-10-06 09:22:35 UTC (rev 35416)
+++ trunk/common/plugins/org.jboss.tools.common.jdt/META-INF/MANIFEST.MF 2011-10-06 11:32:37 UTC (rev 35417)
@@ -8,7 +8,6 @@
org.eclipse.jdt.core;bundle-version="3.7.0",
org.eclipse.core.variables;bundle-version="3.2.500",
org.eclipse.core.resources,
- org.apache.commons.io,
org.jboss.tools.common
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %BundleVendor
Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt.ui/META-INF/MANIFEST.MF 2011-10-06 09:22:35 UTC (rev 35416)
+++ trunk/common/plugins/org.jboss.tools.common.jdt.ui/META-INF/MANIFEST.MF 2011-10-06 11:32:37 UTC (rev 35417)
@@ -11,9 +11,9 @@
org.eclipse.core.variables;bundle-version="3.2.500",
org.jboss.tools.common.jdt,
org.eclipse.core.resources,
- org.apache.commons.io,
org.jboss.tools.common,
- org.eclipse.jst.j2ee.ui;bundle-version="1.1.500"
+ org.eclipse.jst.j2ee.ui;bundle-version="1.1.500",
+ org.eclipse.ui.ide;bundle-version="3.7.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %BundleVendor
Bundle-Localization: plugin
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35416 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-06 05:22:35 -0400 (Thu, 06 Oct 2011)
New Revision: 35416
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java
Log:
[JBIDE-9793] removed "cancel"- and "help"-button from ApplicationDetailsDialog
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-10-06 08:32:48 UTC (rev 35415)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-10-06 09:22:35 UTC (rev 35416)
@@ -13,6 +13,7 @@
import java.util.concurrent.Callable;
import org.eclipse.core.runtime.ILog;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
@@ -42,14 +43,17 @@
public ApplicationDetailsDialog(IApplication application, Shell parentShell) {
super(parentShell);
this.application = application;
- setTitleImage(OpenshiftImages.OPENSHIFT_LOGO_WHITE_MEDIUM_IMG);
}
@Override
+ protected Control createContents(Composite parent) {
+ Control control = super.createContents(parent);
+ setupDialog(parent);
+ return control;
+ }
+
+ @Override
protected Control createDialogArea(Composite parent) {
- parent.getShell().setText("Application Details");
- setTitle(NLS.bind("Application {0}", application.getName()));
-
Composite container = new Composite(parent, SWT.NONE);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(container);
GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6).applyTo(container);
@@ -99,6 +103,19 @@
return container;
}
+ private void setupDialog(Composite parent) {
+ parent.getShell().setText("Application Details");
+ setTitle(NLS.bind("Application {0}", application.getName()));
+ setTitleImage(OpenshiftImages.OPENSHIFT_LOGO_WHITE_MEDIUM_IMG);
+ setDialogHelpAvailable(false);
+ }
+
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
+ true);
+ }
+
private SelectionAdapter onPublicUrl(final String applicationUrl) {
return new SelectionAdapter() {
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35415 - trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-10-06 04:32:48 -0400 (Thu, 06 Oct 2011)
New Revision: 35415
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
Log:
JBIDE-9804: Improvement => Remove MouseListener
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-10-06 08:17:01 UTC (rev 35414)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-10-06 08:32:48 UTC (rev 35415)
@@ -18,8 +18,6 @@
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
import org.jboss.tools.forge.core.io.ForgeAnsiCommandFilter;
import org.jboss.tools.forge.core.io.ForgeHiddenOutputFilter;
import org.jboss.tools.forge.core.io.ForgeOutputListener;
@@ -107,12 +105,6 @@
}
}
});
- getTextWidget().addListener(SWT.MouseUp, new Listener() {
- @Override
- public void handleEvent(Event event) {
- getTextWidget().setCaretOffset(caretOffset);
- }
- });
}
protected StyledText createTextWidget(Composite parent, int styles) {
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35414 - trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-10-06 04:17:01 -0400 (Thu, 06 Oct 2011)
New Revision: 35414
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
Log:
JBIDE-9804: Fix the Mouse Down Event in the Console View
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-10-06 07:54:43 UTC (rev 35413)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-10-06 08:17:01 UTC (rev 35414)
@@ -71,6 +71,7 @@
private ForgeRuntime runtime;
private Document document;
private StyleRange currentStyleRange = null;
+ private int caretOffset = 0;
public ForgeTextViewer(Composite parent, ForgeRuntime runtime) {
super(parent, SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL);
@@ -106,10 +107,10 @@
}
}
});
- getTextWidget().addListener(SWT.MouseDown, new Listener() {
+ getTextWidget().addListener(SWT.MouseUp, new Listener() {
@Override
public void handleEvent(Event event) {
- event.doit = false;
+ getTextWidget().setCaretOffset(caretOffset);
}
});
}
@@ -161,9 +162,8 @@
public void run() {
try {
String filteredOutput = output.replaceAll("\r", "");
- int caretOffset = getTextWidget().getCaretOffset();
document.replace(caretOffset, document.getLength() - caretOffset, filteredOutput);
- getTextWidget().setCaretOffset(caretOffset + filteredOutput.length());
+ getTextWidget().setCaretOffset(caretOffset = caretOffset + filteredOutput.length());
if (currentStyleRange != null) {
currentStyleRange.length = currentStyleRange.length + filteredOutput.length();
getTextWidget().setStyleRange(currentStyleRange);
@@ -227,8 +227,8 @@
private void moveCursorAbsoluteInLine(final String command) {
try {
int column = Integer.valueOf(command.substring(2, command.length() - 1));
- int lineStart = document.getLineOffset(document.getLineOfOffset(getTextWidget().getCaretOffset()));
- getTextWidget().setCaretOffset(lineStart + column - 1);
+ int lineStart = document.getLineOffset(document.getLineOfOffset(caretOffset));
+ getTextWidget().setCaretOffset(caretOffset = lineStart + column - 1);
} catch (BadLocationException e) {
ForgeUIPlugin.log(e);
}
@@ -236,7 +236,6 @@
private void clearCurrentLine(String command) {
try {
- int caretOffset = getTextWidget().getCaretOffset();
document.replace(caretOffset, document.getLength() - caretOffset, "");
} catch (BadLocationException e) {
ForgeUIPlugin.log(e);
@@ -284,7 +283,7 @@
int offset = textWidget.getOffsetAtLine(line);
int maxColumn = textWidget.getLine(line).length();
offset += Math.min(maxColumn, column);
- getTextWidget().setCaretOffset(offset);
+ getTextWidget().setCaretOffset(caretOffset = offset);
}
private void clearCurrentScreenPage(String command) {
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35413 - trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-10-06 03:54:43 -0400 (Thu, 06 Oct 2011)
New Revision: 35413
Removed:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeDocument.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
Log:
Replace ForgeDocument by plain vanilla Document
Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeDocument.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeDocument.java 2011-10-06 07:24:19 UTC (rev 35412)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeDocument.java 2011-10-06 07:54:43 UTC (rev 35413)
@@ -1,27 +0,0 @@
-package org.jboss.tools.forge.ui.console;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-
-public class ForgeDocument extends Document {
-
- public void appendString(final String str) {
-// Display.getDefault().asyncExec(new Runnable() {
-// @Override
-// public void run() {
- try {
- for (int i = 0; i < str.length(); i++) {
- char c = str.charAt(i);
- if (c == '\r') continue; //ignore
- if (str.charAt(i) == '\b') {
- replace(getLength() - 1, 1, "");
- } else {
- replace(getLength(), 0, str.substring(i, i + 1));
- }
- }
- } catch (BadLocationException e) {}
-// }
-// });
- }
-
-}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-10-06 07:24:19 UTC (rev 35412)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-10-06 07:54:43 UTC (rev 35413)
@@ -5,6 +5,7 @@
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.DocumentEvent;
import org.eclipse.jface.text.IDocumentListener;
import org.eclipse.jface.text.TextViewer;
@@ -17,6 +18,8 @@
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
import org.jboss.tools.forge.core.io.ForgeAnsiCommandFilter;
import org.jboss.tools.forge.core.io.ForgeHiddenOutputFilter;
import org.jboss.tools.forge.core.io.ForgeOutputListener;
@@ -26,8 +29,8 @@
public class ForgeTextViewer extends TextViewer {
private static String PREV_CHAR = new Character((char)2).toString();
- private static String BLAH = new Character((char)3).toString();
- private static String EXIT = new Character((char)4).toString();
+ private static String CTRL_C = new Character((char)3).toString();
+ private static String CTRL_D = new Character((char)4).toString();
private static String NEXT_CHAR = new Character((char)6).toString();
private static String DELETE_PREV_CHAR = new Character((char)8).toString();
private static String PREV_HISTORY = new Character((char)16).toString();
@@ -66,11 +69,9 @@
private RuntimeStopListener stopListener;
private ForgeOutputListener outputListener;
private ForgeRuntime runtime;
- private ForgeDocument document;
- private StyleRange currentStyleRange = null;
+ private Document document;
+ private StyleRange currentStyleRange = null;
-
-
public ForgeTextViewer(Composite parent, ForgeRuntime runtime) {
super(parent, SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL);
this.runtime = runtime;
@@ -86,26 +87,31 @@
}
private void initDocument() {
- document = new ForgeDocument();
+ document = new Document();
document.addDocumentListener(new DocumentListener());
setDocument(document);
}
private void initViewer() {
getTextWidget().setFont(JFaceResources.getFont(JFaceResources.TEXT_FONT));
- getTextWidget().addVerifyKeyListener(new VerifyKeyListener() {
-
+ getTextWidget().addVerifyKeyListener(new VerifyKeyListener() {
@Override
public void verifyKey(VerifyEvent event) {
if ((event.stateMask & SWT.CTRL) == SWT.CTRL ) {
if (event.keyCode == 'd') {
- runtime.sendInput(EXIT);
+ runtime.sendInput(CTRL_D);
} else if (event.keyCode == 'c') {
- runtime.sendInput(BLAH);
+ runtime.sendInput(CTRL_C);
}
}
}
});
+ getTextWidget().addListener(SWT.MouseDown, new Listener() {
+ @Override
+ public void handleEvent(Event event) {
+ event.doit = false;
+ }
+ });
}
protected StyledText createTextWidget(Composite parent, int styles) {
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35412 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-10-06 03:24:19 -0400 (Thu, 06 Oct 2011)
New Revision: 35412
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JpaUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-8435
use full interface name to find IType
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JpaUtil.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JpaUtil.java 2011-10-06 05:28:19 UTC (rev 35411)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JpaUtil.java 2011-10-06 07:24:19 UTC (rev 35412)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.core.internal.context.java;
+import java.util.LinkedList;
+import java.util.List;
+
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
@@ -31,11 +34,13 @@
public static boolean isTypeImplementsInterface(IJavaProject javaProject, IType type, String interfaceName) throws JavaModelException{
if (type == null) return false;
String[] interfaces = type.getSuperInterfaceNames();
- for (String interface_ : interfaces) {
- String[][] resolvedInterfaces = type.resolveType(interface_);
+ List<String> resolvedInterfaceNames = new LinkedList<String>();
+ for (int i = 0; i < interfaces.length; i++) {
+ String[][] resolvedInterfaces = type.resolveType(interfaces[i]);
if (resolvedInterfaces != null){
for (String[] parts : resolvedInterfaces) {
String fullName = parts[0].length() > 0 ? parts[0] + '.' + parts[1] : parts[1];
+ resolvedInterfaceNames.add(fullName);
if (interfaceName.equals(fullName))
return true;
}
@@ -55,7 +60,7 @@
}
}
}
- for (String interface_ : interfaces) {
+ for (String interface_ : resolvedInterfaceNames) {
IType parentInterface = javaProject.findType(interface_);
if (isTypeImplementsInterface(javaProject, parentInterface, interfaceName)){
return true;
13 years, 3 months
- 1
- 0