JBoss Tools SVN: r29609 - trunk/download.jboss.org/jbosstools/updates/requirements.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-03-08 12:59:54 -0500 (Tue, 08 Mar 2011)
New Revision: 29609
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/index.html
Log:
update links to reqs in index page
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/index.html 2011-03-08 17:28:05 UTC (rev 29608)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/index.html 2011-03-08 17:59:54 UTC (rev 29609)
@@ -48,30 +48,36 @@
<ul>
<h2>JBoss Tools 3.3 / Eclipse 3.7 Indigo / Web Tools 3.3</h2>
<li><a class=link href=indigo>indigo</a></li>
-<li><a class=link href=birt/4.0>birt/4.0</a></li>
+<li><a class=link href=birt>birt</a></li>
<li><a class=link href=ecf>ecf</a></li>
<li><a class=link href=eclipse>eclipse</a></li>
<li><a class=link href=emf>emf</a></li>
-<li><a class=link href=gwt>gwt</a></li>
+<li><a class=link href=gwt/201102111811>gwt/201102111811</a></li>
<li><a class=link href=m2eclipse>m2eclipse</a></li>
<li><a class=link href=orbit/S20110124210048>orbit/S20110124210048</a></li>
<li><a class=link href=subclipse>subclipse</a></li>
<li><a class=link href=subversive>subversive</a></li>
<li><a class=link href=swtbot/2.0.3>swtbot/2.0.3</a></li>
-<li><a class=link href=tptp>tptp/4.7</a></li>
-<li><a class=link href=webtools/3.3>webtools/3.3</a></li>
+<li><a class=link href=tptp/4.7>tptp/4.7</a></li>
+<li><a class=link href=webtools>webtools</a></li>
<li><a class=link href=xulrunner-1.9.1.2>xulrunner-1.9.1.2</a></li>
<li><a class=link href=xulrunner-1.9.2>xulrunner-1.9.2</a> (?)</li>
<p>
<h2>JBoss Tools 3.2 / Eclipse 3.6 Helios / Web Tools 3.2</h2>
<li><a class=link href=helios>helios</a></li>
<li><a class=link href=birt/2.6.2>birt/2.6.2</a></li>
-<li><a class=link href=gwt>gwt</a></li>
+<li><a class=link href=ecf>ecf/3.4</a></li>
+<li><a class=link href=eclipse>eclipse/3.6</a></li>
+<li><a class=link href=emf>emf/2.6</a></li>
+<li><a class=link href=gwt/201012211742>gwt/201012211742</a></li>
<li><a class=link href=orbit/R20100519200754>orbit/R20100519200754</a></li>
-<li><a class=link href=thirdparty>thirdparty</a></li>
-<li><a class=link href=swtbot-helios>swtbot-helios</a></li>
+<li><a class=link href=m2eclipse/0.11>m2eclipse/0.11</a></li>
+<li><a class=link href=thirdparty>thirdparty</a> (deprecated)</li>
+<li><a class=link href=subclipse/1.6>subclipse/1.6</a></li>
+<li><a class=link href=subversive/0.7.9_2.2.2>subversive/0.7.9_2.2.2</a></li>
+<li><a class=link href=swtbot/2.0.3>swtbot/2.0.3</a></li>
<li><a class=link href=tptp>tptp/4.7</a></li>
-<li><a class=link href=webtools/3.2>webtools/3.2</a></li>
+<li><a class=link href=webtools/3.2.3>webtools/3.2.3</a></li>
<li><a class=link href=xulrunner-1.9.1.2>xulrunner-1.9.1.2</a></li>
<p>
<h2>JBoss Tools 3.1 / Eclipse 3.5 Galileo / Web Tools 3.1</h2>
13 years, 10 months
JBoss Tools SVN: r29608 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-03-08 12:28:05 -0500 (Tue, 08 Mar 2011)
New Revision: 29608
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImageWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
Log:
[JBIDE-8090] set window titles to wizards
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-03-08 17:19:35 UTC (rev 29607)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-03-08 17:28:05 UTC (rev 29608)
@@ -1,5 +1,12 @@
2011-03-08 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImageWizard.java (addPages):
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java (addPages):
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java (addPages):
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java (init):
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java (init):
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java (addPages):
+ [JBIDE-8090] set window titles to wizards
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (createWidgets):
[JBIDE-8293] added link to SSH2 private keys in preferences
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-03-08 17:19:35 UTC (rev 29607)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-03-08 17:28:05 UTC (rev 29608)
@@ -16,6 +16,8 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IWorkbench;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
import org.jboss.tools.deltacloud.core.job.AbstractCloudJob;
@@ -34,6 +36,11 @@
}
@Override
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ setWindowTitle(WizardMessages.getString("EditCloudConnection.name"));
+ }
+
+ @Override
public boolean performFinish() {
String name = mainPage.getConnectionName();
String url = mainPage.getUrl();
@@ -43,6 +50,7 @@
return editCloud(initialCloud, name, url, username, password, driver);
}
+
private boolean editCloud(final DeltaCloud cloud, final String name, final String url, final String username,
final String password, final DeltaCloudDriver driver) {
try {
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImageWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImageWizard.java 2011-03-08 17:19:35 UTC (rev 29607)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImageWizard.java 2011-03-08 17:28:05 UTC (rev 29608)
@@ -32,6 +32,7 @@
@Override
public void addPages() {
+ setWindowTitle(WizardMessages.getString("FindImage.title"));
mainPage = new FindImagePage(cloud);
addPage(mainPage);
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java 2011-03-08 17:19:35 UTC (rev 29607)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java 2011-03-08 17:28:05 UTC (rev 29608)
@@ -26,7 +26,7 @@
@Override
public void addPages() {
- // TODO Auto-generated method stub
+ setWindowTitle(WizardMessages.getString("ImageFilter.title"));
mainPage = new ImageFilterPage(getDeltaCloud());
addPage(mainPage);
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java 2011-03-08 17:19:35 UTC (rev 29607)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java 2011-03-08 17:28:05 UTC (rev 29608)
@@ -27,6 +27,7 @@
@Override
public void addPages() {
+ setWindowTitle(WizardMessages.getString("InstanceFilter.title"));
mainPage = new InstanceFilterPage(getDeltaCloud());
addPage(mainPage);
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java 2011-03-08 17:19:35 UTC (rev 29607)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java 2011-03-08 17:28:05 UTC (rev 29608)
@@ -32,6 +32,7 @@
@Override
public void addPages() {
+ setWindowTitle(WizardMessages.getString("ManageKeys.title"));
mainPage = new ManageKeysPage(getDeltaCloud());
addPage(mainPage);
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-03-08 17:19:35 UTC (rev 29607)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-03-08 17:28:05 UTC (rev 29608)
@@ -72,6 +72,7 @@
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
+ setWindowTitle(WizardMessages.getString("NewCloudConnection.name"));
}
@Override
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-03-08 17:19:35 UTC (rev 29607)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-03-08 17:28:05 UTC (rev 29608)
@@ -61,6 +61,7 @@
@Override
public void addPages() {
+ setWindowTitle(WizardMessages.getString("NewInstance.title"));
mainPage = new NewInstancePage(getDeltaCloud(), image);
addPage(mainPage);
additionalPages = DeltacloudUIExtensionManager.getDefault().loadNewInstanceWizardPages();
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2011-03-08 17:19:35 UTC (rev 29607)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2011-03-08 17:28:05 UTC (rev 29608)
@@ -15,6 +15,7 @@
CloudConnectionTestFailure.msg=Connection Test failed
CloudConnectionTestingCredentials.msg=Testing credentials...
CloudConnectionInvalidCredentials.msg=Invalid credentials
+NewCloudConnection.name=New Cloud Connection
EditCloudConnection.name=Edit Cloud Connection
EditCloudConnectionError.title=Error Editing Cloud Connection
13 years, 10 months
JBoss Tools SVN: r29606 - trunk/build/parent.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-03-08 12:19:22 -0500 (Tue, 08 Mar 2011)
New Revision: 29606
Modified:
trunk/build/parent/pom.xml
Log:
simplify target platforms using single composite helios requirements site
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-03-08 17:19:11 UTC (rev 29605)
+++ trunk/build/parent/pom.xml 2011-03-08 17:19:22 UTC (rev 29606)
@@ -30,13 +30,11 @@
<target.platform.classifier.local>local
</target.platform.classifier.local>
- <!-- Set this to a path on your own machine, or use remote URL like http://download.jboss.org/jbosstools/updates/target-platform/latest/
- Can also generate a local.target file which will always point to your local
- repo w/o having to edit here. See local.target profile below for more information. -->
- <target.platform.site>file://home/hudson/static_build_env/jbds/target-platform/e362-wtp323.target/
- </target.platform.site>
<jbosstools.update.site>http://download.jboss.org/jbosstools/updates/nightly/trunk</jbosstools.update.site>
<jbosstools-target-platform-repo>http://download.jboss.org/jbosstools/updates/target-platform/latest/</jbosstools-target-platform-repo>
+
+ <!-- pass in your own path using -Dtarget.platform.site=file://home/$user/trunk/build/target-platform/REPO/ -->
+ <target.platform.site>file://home/hudson/static_build_env/jbds/target-platform/e362-wtp323.target/</target.platform.site>
</properties>
<build>
@@ -209,6 +207,61 @@
</issueManagement>
<profiles>
+ <profile>
+ <id>jbosstools-nightly</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jbosstools-nightly</id>
+ <url>${jbosstools.update.site}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>jbosstools-nightly-staging-composite</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jbosstools-nightly-staging-composite</id>
+ <url>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>jboss-requirements-composite-mirror</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jboss-requirements-composite-mirror</id>
+ <url>http://download.jboss.org/jbosstools/updates/helios/</url>
+ <layout>p2</layout>
+ <snapshots> <enabled>true</enabled> </snapshots>
+ <releases> <enabled>true</enabled> </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+
<!-- TODO: remove this when no one depends on it; replace with unified.target,
not multiuple.target, since no one should need to resolve against all these
sites (and one site is by far faster) ! -->
@@ -382,8 +435,7 @@
<repositories>
<repository>
<id>jbosstools-target-platform-repo</id>
- <url>http://download.jboss.org/jbosstools/updates/target-platform/latest/
- </url>
+ <url>${jbosstools-target-platform-repo}</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -408,8 +460,7 @@
<repositories>
<repository>
<id>jbosstools-target-platform-repo</id>
- <url>http://download.jboss.org/jbosstools/updates/target-platform/latest/
- </url>
+ <url>${jbosstools-target-platform-repo}</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -419,8 +470,8 @@
</releases>
</repository>
<repository>
- <id>helios</id>
- <url>http://download.eclipse.org/releases/helios/</url>
+ <id>jbosstools-requirements-composite-mirror</id>
+ <url>http://download.jboss.org/jbosstools/updates/helios/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -429,102 +480,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
- <id>eclipse36</id>
- <url>http://download.eclipse.org/eclipse/updates/3.6/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>jboss-webtools32</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>jboss-birt26</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/birt/2.6/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>jboss-swtbot-helios</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>m2eclipse</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>m2eclipse-extras</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>jboss-xulrunner-1.9.1.2</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <!--repository> <id>jboss-xulrunner-1.9.2</id> <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2/
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository -->
- <repository>
- <id>google eclipse plugins</id>
- <url>http://dl.google.com/eclipse/plugin/3.6</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
</repositories>
</profile>
@@ -755,44 +710,6 @@
</profile>
<profile>
- <id>jbosstools-nightly-trunk</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>jbosstools-nightly-trunk</id>
- <url>${jbosstools.update.site}</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>jbosstools-nightly-staging-composite-trunk</id>
- <url>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/ </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>jboss-requirements-composite-mirror</id>
- <url>http://download.jboss.org/jbosstools/updates/helios/</url>
- <layout>p2</layout>
- <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases>
- </repository>
- </repositories>
- </profile>
-
- <profile>
<!-- this plugin is available from https://github.com/nickboldt/maven-plugins/tree/master/unique-GAV-plugin/ -->
<id>GAV</id>
<build>
13 years, 10 months
JBoss Tools SVN: r29605 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-03-08 12:19:11 -0500 (Tue, 08 Mar 2011)
New Revision: 29605
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
simplify target platforms using single composite helios requirements site
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-03-08 17:18:58 UTC (rev 29604)
+++ trunk/build/target-platform/multiple.target 2011-03-08 17:19:11 UTC (rev 29605)
@@ -8,41 +8,22 @@
-->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <!-- NOT <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.2.20100623-1649"/> -->
+ <repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
+
<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.12.1.20110112-1712"/>
- <repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.1.20101108-1810"/>
- <repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <repository location="http://eclipse.svnkit.com/1.3.x/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <repository location="http://download.eclipse.org/technology/subversive/0.7/weekly-site/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<!-- want the latest, 1.6.2.v201005080631, not 1.5.1.v201005080630 -->
- <!-- <unit id="javax.wsdl" version="1.6.2.v201005080631"/>
- <unit id="javax.wsdl" version="1.5.1.v201005080630"/> -->
- <unit id="javax.wsdl" version="1.5.1.v201005080630"/>
+ <!--
+ <unit id="javax.wsdl" version="1.6.2.v201005080631"/>
+ -->
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519..."/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.12.v20110120-2050-H36-CR1"/>
<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.12.v20110120-2050-H36-CR1"/>
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.2.v201101261720-7H7F4AkF7B88MAQCKJH"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
<unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.2.v201101261720-8X8ZFXoFLWUl6wn5veAISx"/>
@@ -53,9 +34,7 @@
<unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.2.v201101271120-7H7BF8QAkF7B87RBVCFFD"/>
<unit id="org.eclipse.tptp.platform.commons.logging.feature.group" version="4.5.0.v201005032111-2-37w312116191612"/>
<unit id="org.eclipse.tptp.platform.jakarta.log4j.feature.group" version="4.5.0.v201005032111-217E7w312116191611"/>
- <repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.emf.ecore.feature.group" version="2.6.1.v20100914-1218"/>
<unit id="org.eclipse.emf.feature.group" version="2.6.1.v20100914-1218"/>
<unit id="org.eclipse.emf.codegen.feature.group" version="2.6.0.v20100914-1218"/>
@@ -68,25 +47,19 @@
<unit id="org.eclipse.emf.edit.feature.group" version="2.6.0.v20100914-1218"/>
<unit id="org.eclipse.xsd.edit.feature.group" version="2.6.0.v20100914-1218"/>
<unit id="org.eclipse.xsd.feature.group" version="2.6.0.v20100914-1218"/>
- <repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.2.r262_v20101008-57B381wLglLKxfjdt881PQeMU42p"/>
<unit id="org.eclipse.birt.feature.group" version="2.6.2.r262_v20101008-9iF7A9JGHMBCRz-R8tbxRel8kQrI"/>
<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
<unit id="org.eclipse.birt.chart.feature.group" version="2.6.2.r262_v20101008-7f9T7OFPWowQ1naKt1Wwu4"/>
<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/birt/2.6.2/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
<unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.1.R36x_v20101007-7K7QEtDVci4YrnH_88QAH"/>
<unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKv99HL0GvIAF99I8H14B7E"/>
@@ -119,9 +92,7 @@
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.0.v20100510-42A79oB5855K5E"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
<unit id="org.eclipse.rcp.feature.group" version="3.6.2.r362_v20101104-9SAxFMKFkSAqi8axkv1ZjegmiBLY"/>
- <repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.2.v201010181125-7C7b8mEt1Zwkn9kfkUHHsoP_3to"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.2.v201010181125-7J8x7UBWwUN6z02z-fiI_w4x4uLf"/>
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.2.v201010181125-2-07w31211518181A"/>
@@ -168,9 +139,7 @@
<unit version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6" id="org.eclipse.emf.validation.feature.group"/>
<unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/>
<unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> -->
- <repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.jst.jee" version="1.0.302.v201101122300"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/>
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.103.v201101271715"/>
@@ -207,17 +176,13 @@
<unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.3.v201102160541-7E7AFI3AJrn5TN32vSJ8nRIWLD7_"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.3.v201102160541-7I78FZIEtEoO2d7AsK6jSNqC-8jj"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.3.v201102160550-7C7OFXcF7RZHQKIkMxMsW_"/>
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2.3/"/>
+
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
+ <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
</location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
- <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
- <!-- <repository location="http://dl.google.com/eclipse/plugin/3.6/"/> -->
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/"/>
- </location>
</locations>
<includeBundles>
<feature id="org.drools.eclipse.feature"/>
@@ -227,4 +192,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-03-08 17:18:58 UTC (rev 29604)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-03-08 17:19:11 UTC (rev 29605)
@@ -28,23 +28,8 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
-<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
-<repository location="http://eclipse.svnkit.com/1.3.x/"/>
-<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
-<repository location="http://download.eclipse.org/technology/subversive/0.7/weekly-site/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519..."/>
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/"/>
-<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
-<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/birt/2.6.2/"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2.3/"/>
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/"/>
</source>
<iu id="org.maven.ide.eclipse.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-03-08 17:18:58 UTC (rev 29604)
+++ trunk/build/target-platform/unified.target 2011-03-08 17:19:11 UTC (rev 29605)
@@ -8,41 +8,22 @@
-->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <!-- NOT <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.2.20100623-1649"/> -->
- <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.12.1.20110112-1712"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
+ <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.12.1.20110112-1712"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.1.20101108-1810"/>
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<!-- want the latest, 1.6.2.v201005080631, not 1.5.1.v201005080630 -->
- <!-- <unit id="javax.wsdl" version="1.6.2.v201005080631"/>
- <unit id="javax.wsdl" version="1.5.1.v201005080630"/> -->
- <unit id="javax.wsdl" version="1.5.1.v201005080630"/>
+ <!--
+ <unit id="javax.wsdl" version="1.6.2.v201005080631"/>
+ -->
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.12.v20110120-2050-H36-CR1"/>
<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.12.v20110120-2050-H36-CR1"/>
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.2.v201101261720-7H7F4AkF7B88MAQCKJH"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
<unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.2.v201101261720-8X8ZFXoFLWUl6wn5veAISx"/>
@@ -53,9 +34,7 @@
<unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.2.v201101271120-7H7BF8QAkF7B87RBVCFFD"/>
<unit id="org.eclipse.tptp.platform.commons.logging.feature.group" version="4.5.0.v201005032111-2-37w312116191612"/>
<unit id="org.eclipse.tptp.platform.jakarta.log4j.feature.group" version="4.5.0.v201005032111-217E7w312116191611"/>
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.emf.ecore.feature.group" version="2.6.1.v20100914-1218"/>
<unit id="org.eclipse.emf.feature.group" version="2.6.1.v20100914-1218"/>
<unit id="org.eclipse.emf.codegen.feature.group" version="2.6.0.v20100914-1218"/>
@@ -68,25 +47,19 @@
<unit id="org.eclipse.emf.edit.feature.group" version="2.6.0.v20100914-1218"/>
<unit id="org.eclipse.xsd.edit.feature.group" version="2.6.0.v20100914-1218"/>
<unit id="org.eclipse.xsd.feature.group" version="2.6.0.v20100914-1218"/>
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.2.r262_v20101008-57B381wLglLKxfjdt881PQeMU42p"/>
<unit id="org.eclipse.birt.feature.group" version="2.6.2.r262_v20101008-9iF7A9JGHMBCRz-R8tbxRel8kQrI"/>
<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
<unit id="org.eclipse.birt.chart.feature.group" version="2.6.2.r262_v20101008-7f9T7OFPWowQ1naKt1Wwu4"/>
<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
<unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.1.R36x_v20101007-7K7QEtDVci4YrnH_88QAH"/>
<unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKv99HL0GvIAF99I8H14B7E"/>
@@ -119,9 +92,7 @@
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.0.v20100510-42A79oB5855K5E"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
<unit id="org.eclipse.rcp.feature.group" version="3.6.2.r362_v20101104-9SAxFMKFkSAqi8axkv1ZjegmiBLY"/>
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.2.v201010181125-7C7b8mEt1Zwkn9kfkUHHsoP_3to"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.2.v201010181125-7J8x7UBWwUN6z02z-fiI_w4x4uLf"/>
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.2.v201010181125-2-07w31211518181A"/>
@@ -168,9 +139,7 @@
<unit version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6" id="org.eclipse.emf.validation.feature.group"/>
<unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/>
<unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> -->
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+
<unit id="org.eclipse.jst.jee" version="1.0.302.v201101122300"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/>
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.103.v201101271715"/>
@@ -207,17 +176,13 @@
<unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.3.v201102160541-7E7AFI3AJrn5TN32vSJ8nRIWLD7_"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.3.v201102160541-7I78FZIEtEoO2d7AsK6jSNqC-8jj"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.3.v201102160550-7C7OFXcF7RZHQKIkMxMsW_"/>
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
+ <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
- <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
- <!-- <repository location="http://dl.google.com/eclipse/plugin/3.6/"/> -->
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- </location>
</locations>
<includeBundles>
<feature id="org.drools.eclipse.feature"/>
@@ -227,4 +192,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-03-08 17:18:58 UTC (rev 29604)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-03-08 17:19:11 UTC (rev 29605)
@@ -30,21 +30,6 @@
<source>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</source>
<iu id="org.maven.ide.eclipse.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
13 years, 10 months
JBoss Tools SVN: r29604 - in trunk/download.jboss.org/jbosstools/updates: indigo and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-03-08 12:18:58 -0500 (Tue, 08 Mar 2011)
New Revision: 29604
Modified:
trunk/download.jboss.org/jbosstools/updates/helios/README.txt
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/README.txt
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
Log:
update composites to use relative paths so the mirror on reports.qa uses local files; add emf/ecf/eclipse + others to helios mirror; rename ecf 3.4M5 to 3.4 in Indigo
Modified: trunk/download.jboss.org/jbosstools/updates/helios/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/README.txt 2011-03-08 16:10:12 UTC (rev 29603)
+++ trunk/download.jboss.org/jbosstools/updates/helios/README.txt 2011-03-08 17:18:58 UTC (rev 29604)
@@ -1,14 +1,21 @@
Instead of mirroring Helios here, composite a site here from:
-<children size='7'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/20110225...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/birt/2.6.2/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2.3/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/'/>
+<children size='14'>
+<child location='../requirements/helios/201102250900/'/>
+<child location='../requirements/birt/2.6.2/'/>
+<child location='../requirements/ecf/3.4/'/>
+<child location='../requirements/eclipse/3.6.2/'/>
+<child location='../requirements/emf/2.6/'/>
+<child location='../requirements/gwt/201012211742/'/>
+<child location='../requirements/m2eclipse/0.12/'/>
+<child location='../requirements/orbit/S20110124210048/'/>
+<child location='../requirements/subclipse/1.6/'/>
+<child location='../requirements/subversive/0.7.9_2.2.2/'/>
+<child location='../requirements/swtbot/2.0.3/'/>
+<child location='../requirements/tptp/4.7/'/>
+<child location='../requirements/webtools/3.2.3/'/>
+<child location='../requirements/xulrunner-1.9.1.2/'/>
</children>
See /updates/requirements/helios/README.txt for how to mirror from eclipse.org to here.
-See /updates/requirements/{birt,gwt,swtbot,webtools}/build.xml for how to mirror other sites.
+See /updates/requirements/{birt,gwt,swtbot,webtools,...}/build.xml for how to mirror other sites.
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-03-08 16:10:12 UTC (rev 29603)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-03-08 17:18:58 UTC (rev 29604)
@@ -7,15 +7,22 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1299342580000'/>
+<property name='p2.timestamp' value='1299603042000'/>
</properties>
-<children size='7'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/20110225...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/birt/2.6.2/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2.3/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/'/>
+<children size='14'>
+<child location='../requirements/helios/201102250900/'/>
+<child location='../requirements/birt/2.6.2/'/>
+<child location='../requirements/ecf/3.4/'/>
+<child location='../requirements/eclipse/3.6.2/'/>
+<child location='../requirements/emf/2.6/'/>
+<child location='../requirements/gwt/201012211742/'/>
+<child location='../requirements/m2eclipse/0.12/'/>
+<child location='../requirements/orbit/S20110124210048/'/>
+<child location='../requirements/subclipse/1.6/'/>
+<child location='../requirements/subversive/0.7.9_2.2.2/'/>
+<child location='../requirements/swtbot/2.0.3/'/>
+<child location='../requirements/tptp/4.7/'/>
+<child location='../requirements/webtools/3.2.3/'/>
+<child location='../requirements/xulrunner-1.9.1.2/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-03-08 16:10:12 UTC (rev 29603)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-03-08 17:18:58 UTC (rev 29604)
@@ -7,15 +7,22 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1299342580000'/>
+<property name='p2.timestamp' value='1299603042000'/>
</properties>
-<children size='7'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/20110225...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/birt/2.6.2/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2.3/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/'/>
+<children size='14'>
+<child location='../requirements/helios/201102250900/'/>
+<child location='../requirements/birt/2.6.2/'/>
+<child location='../requirements/ecf/3.4/'/>
+<child location='../requirements/eclipse/3.6.2/'/>
+<child location='../requirements/emf/2.6/'/>
+<child location='../requirements/gwt/201012211742/'/>
+<child location='../requirements/m2eclipse/0.12/'/>
+<child location='../requirements/orbit/S20110124210048/'/>
+<child location='../requirements/subclipse/1.6/'/>
+<child location='../requirements/subversive/0.7.9_2.2.2/'/>
+<child location='../requirements/swtbot/2.0.3/'/>
+<child location='../requirements/tptp/4.7/'/>
+<child location='../requirements/webtools/3.2.3/'/>
+<child location='../requirements/xulrunner-1.9.1.2/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/README.txt 2011-03-08 16:10:12 UTC (rev 29603)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/README.txt 2011-03-08 17:18:58 UTC (rev 29604)
@@ -1,20 +1,20 @@
Instead of mirroring Helios here, composite a site here from:
<children size='14'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/indigo/20110204...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/birt/4.0/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/ecf/3.4M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/eclipse/3.7M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/emf/2.7M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/gwt/201102111811/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/0.12/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/S20110124...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/subclipse/1.6/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/subversive/0.7....'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/tptp/4.7/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/webtools/3.3M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/'/>
+<child location='../requirements/indigo/201102040900/'/>
+<child location='../requirements/birt/4.0/'/>
+<child location='../requirements/ecf/3.4/'/>
+<child location='../requirements/eclipse/3.7M5/'/>
+<child location='../requirements/emf/2.7M5/'/>
+<child location='../requirements/gwt/201102111811/'/>
+<child location='../requirements/m2eclipse/0.12/'/>
+<child location='../requirements/orbit/S20110124210048/'/>
+<child location='../requirements/subclipse/1.6/'/>
+<child location='../requirements/subversive/0.7.9_2.2.2/'/>
+<child location='../requirements/swtbot/2.0.3/'/>
+<child location='../requirements/tptp/4.7/'/>
+<child location='../requirements/webtools/3.3M5/'/>
+<child location='../requirements/xulrunner-1.9.1.2/'/>
</children>
See /updates/requirements/indigo/README.txt for how to mirror from eclipse.org to here.
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-03-08 16:10:12 UTC (rev 29603)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-03-08 17:18:58 UTC (rev 29604)
@@ -7,22 +7,22 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1299518977000'/>
+<property name='p2.timestamp' value='1299603042000'/>
</properties>
<children size='14'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/indigo/20110204...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/birt/4.0M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/ecf/3.4M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/eclipse/3.7M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/emf/2.7M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/gwt/201102111811/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/0.12/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/S20110124...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/subclipse/1.6/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/subversive/0.7....'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/tptp/4.7/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/webtools/3.3M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/'/>
+<child location='../requirements/indigo/201102040900/'/>
+<child location='../requirements/birt/4.0M5/'/>
+<child location='../requirements/ecf/3.4/'/>
+<child location='../requirements/eclipse/3.7M5/'/>
+<child location='../requirements/emf/2.7M5/'/>
+<child location='../requirements/gwt/201102111811/'/>
+<child location='../requirements/m2eclipse/0.12/'/>
+<child location='../requirements/orbit/S20110124210048/'/>
+<child location='../requirements/subclipse/1.6/'/>
+<child location='../requirements/subversive/0.7.9_2.2.2/'/>
+<child location='../requirements/swtbot/2.0.3/'/>
+<child location='../requirements/tptp/4.7/'/>
+<child location='../requirements/webtools/3.3M5/'/>
+<child location='../requirements/xulrunner-1.9.1.2/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-03-08 16:10:12 UTC (rev 29603)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-03-08 17:18:58 UTC (rev 29604)
@@ -7,22 +7,22 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1299518977000'/>
+<property name='p2.timestamp' value='1299603042000'/>
</properties>
<children size='14'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/indigo/20110204...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/birt/4.0M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/ecf/3.4M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/eclipse/3.7M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/emf/2.7M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/gwt/201102111811/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/0.12/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/S20110124...'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/subclipse/1.6/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/subversive/0.7....'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/tptp/4.7/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/webtools/3.3M5/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/'/>
+<child location='../requirements/indigo/201102040900/'/>
+<child location='../requirements/birt/4.0M5/'/>
+<child location='../requirements/ecf/3.4/'/>
+<child location='../requirements/eclipse/3.7M5/'/>
+<child location='../requirements/emf/2.7M5/'/>
+<child location='../requirements/gwt/201102111811/'/>
+<child location='../requirements/m2eclipse/0.12/'/>
+<child location='../requirements/orbit/S20110124210048/'/>
+<child location='../requirements/subclipse/1.6/'/>
+<child location='../requirements/subversive/0.7.9_2.2.2/'/>
+<child location='../requirements/swtbot/2.0.3/'/>
+<child location='../requirements/tptp/4.7/'/>
+<child location='../requirements/webtools/3.3M5/'/>
+<child location='../requirements/xulrunner-1.9.1.2/'/>
</children>
</repository>
13 years, 10 months
JBoss Tools SVN: r29603 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-03-08 11:10:12 -0500 (Tue, 08 Mar 2011)
New Revision: 29603
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
Log:
[JBIDE-8293] added link to SSH2 private keys in preferences
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-03-08 15:25:47 UTC (rev 29602)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-03-08 16:10:12 UTC (rev 29603)
@@ -1,3 +1,8 @@
+2011-03-08 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (createWidgets):
+ [JBIDE-8293] added link to SSH2 private keys in preferences
+
2011-02-18 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-03-08 15:25:47 UTC (rev 29602)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-03-08 16:10:12 UTC (rev 29603)
@@ -44,6 +44,7 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
@@ -54,10 +55,14 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.PreferencesUtil;
import org.jboss.tools.common.log.StatusFactory;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
@@ -81,6 +86,8 @@
*/
public class NewInstancePage extends WizardPage {
+ private static final String SSH_PREFERENCE_PAGE_ID = "org.eclipse.jsch.ui.SSHPreferences";
+
private static final int IMAGE_CHECK_DELAY = 500;
private static final int KEY_CHECK_DELAY = 500;
@@ -102,6 +109,7 @@
private static final String MUST_ENTER_IMAGE_ID = "ErrorMustProvideImageId.text"; //$NON-NLS-1$
private static final String LOADING_VALUE = "Loading.value"; //$NON-NLS-1$
private static final String IMAGE_ID_NOT_FOUND = "ErrorImageIdNotFound.text"; //$NON-NLS-1$
+ private static final String SHOW_SSH2_PREFS = "ShowSSH2Preferences.label"; //$NON-NLS-1$
private Composite container;
private NewInstancePageModel model;
@@ -216,6 +224,23 @@
keyManageButton.addSelectionListener(manageListener);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).applyTo(keyManageButton);
+ Label dummyLabel = new Label(container, SWT.NULL);
+ dummyLabel.setVisible(false);
+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(dummyLabel);
+
+ Link sshPrefsLink = new Link(container, SWT.NULL);
+ sshPrefsLink.setText(WizardMessages.getString(SHOW_SSH2_PREFS));
+ sshPrefsLink.addListener(SWT.Selection, new Listener() {
+
+ @Override
+ public void handleEvent(Event event) {
+ PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(
+ event.display.getActiveShell(), SSH_PREFERENCE_PAGE_ID, null, null);
+ dialog.open();
+ }
+ });
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(2, 1).applyTo(sshPrefsLink);
+
Label hardwareLabel = new Label(container, SWT.NULL);
hardwareLabel.setText(WizardMessages.getString(HARDWARE_LABEL));
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(hardwareLabel);
@@ -440,9 +465,9 @@
if (keyName == null) {
return false;
}
- for (String key :SshPrivateKeysPreferences.getKeys()) {
+ for (String key : SshPrivateKeysPreferences.getKeys()) {
File file = new File(key);
- if (file.getName().equals(keyName)
+ if (file.getName().equals(keyName)
|| file.getName().startsWith(keyName + ".")) {
return true;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2011-03-08 15:25:47 UTC (rev 29602)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2011-03-08 16:10:12 UTC (rev 29603)
@@ -84,6 +84,7 @@
ErrorMustProvideName.text=A name must be specified
ErrorMustProvideKeyName.text=A key name must be specified
ErrorMustProvideImageId.text=An image id must be specified
+ShowSSH2Preferences.label=<a>Show Private Keys in preferences</a>
NewInstance.desc=Specify details for a new instance you wish to launch based on an image
NewInstance.title=Launch Instance
13 years, 10 months
JBoss Tools SVN: r29602 - branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp.
by jbosstools-commits@lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-03-08 10:25:47 -0500 (Tue, 08 Mar 2011)
New Revision: 29602
Modified:
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
Log:
fixed another SWTBot 2.0.3 incompatibility
Modified: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-03-08 15:18:37 UTC (rev 29601)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-03-08 15:25:47 UTC (rev 29602)
@@ -119,8 +119,8 @@
wiz.comboBoxWithLabel(
WebServicesWebServiceClient.TEXT_SERVICE_DEFINITION).setText(
wsdlDef);
- SWTBotScaleExt slider = bot.scale();
- slider.setSelection(type);
+ SWTBotScale slider = bot.scale();
+ slider.setValue(type);
selectJbossWSRuntime();
bot.sleep(TIME_1S); // wait for wizard to validate wsdl url and
// enable Finish button
13 years, 10 months
JBoss Tools SVN: r29601 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp.
by jbosstools-commits@lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-03-08 10:18:37 -0500 (Tue, 08 Mar 2011)
New Revision: 29601
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
Log:
fixed another swtbot 2.0.3 incompatibility
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-03-08 12:08:10 UTC (rev 29600)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-03-08 15:18:37 UTC (rev 29601)
@@ -33,6 +33,7 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotScale;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
@@ -119,8 +120,8 @@
wiz.comboBoxWithLabel(
WebServicesWebServiceClient.TEXT_SERVICE_DEFINITION).setText(
wsdlDef);
- SWTBotScaleExt slider = bot.scale();
- slider.setSelection(type);
+ SWTBotScale slider = bot.scale();
+ slider.setValue(type);
selectJbossWSRuntime();
bot.sleep(TIME_1S); // wait for wizard to validate wsdl url and
// enable Finish button
13 years, 10 months
JBoss Tools SVN: r29600 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor/tags and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-03-08 07:08:10 -0500 (Tue, 08 Mar 2011)
New Revision: 29600
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataDefinitionTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ListShuttleTagTest.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
Log:
Added DataDefinitionTagTest and ListShuttleTagTest.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-03-08 11:46:49 UTC (rev 29599)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-03-08 12:08:10 UTC (rev 29600)
@@ -36,10 +36,12 @@
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnsTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ComboBoxTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.CoreHTMLTagsTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataDefinitionTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.FileUploadTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.InplaceInputTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.InplaceSelectInputTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.JSFTagsTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.ListShuttleTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.PanelMenuTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.PickListTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ProgressTagTest;
@@ -115,6 +117,8 @@
suite.addTestSuite(PickListTagTest.class);
suite.addTestSuite(ProgressTagTest.class);
suite.addTestSuite(PanelMenuTagTest.class);
+ suite.addTestSuite(ListShuttleTagTest.class);
+ suite.addTestSuite(DataDefinitionTagTest.class);
suite.addTestSuite(XhtmlFilePerformanceTest.class);
return new TestSetup(suite);
}
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataDefinitionTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataDefinitionTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataDefinitionTagTest.java 2011-03-08 12:08:10 UTC (rev 29600)
@@ -0,0 +1,79 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+
+/**
+ * Tests Rich Faces Data Definition Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class DataDefinitionTagTest extends RichFacesTagsTest{
+ private static String testText = "test_text";
+ private static int numRows = 3;
+ @Override
+ protected void initPageContent() {
+ xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" +
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"\n" +
+ " xmlns:rich=\"http://richfaces.org/rich\"\n" +
+ " xmlns:a4j=\"http://richfaces.org/a4j\">\n" +
+ " <head>\n" +
+ " </head>\n" +
+ " <body>\n" +
+ " <f:view>\n" +
+ " <h:form>\n" +
+ " <rich:dataDefinitionList id=\"defList\" rows=\"" + numRows +"\" title=\"Book Store\">\n" +
+ " " + testText +"\n" +
+ " </rich:dataDefinitionList>\n" +
+ " </h:form>\n" +
+ " </f:view>\n" +
+ " </body>\n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser,
+ DataDefinitionTagTest.testText,
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsManyNodes(xhtmlWebBrowser,
+ "DD",
+ DataDefinitionTagTest.numRows,
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "DL",
+ new String[]{"class"},
+ new String[]{"listClass"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "DD",
+ new String[]{"class"},
+ new String[]{"columnClass"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ // check tag selection
+ xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DD",2), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = xhtmlEditor.getSelection();
+ String hasToStartWith = "<rich:dataDefinitionList ";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ String hasEndWith = "</rich:dataDefinitionList>";
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().endsWith(hasEndWith));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataDefinitionTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ListShuttleTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ListShuttleTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ListShuttleTagTest.java 2011-03-08 12:08:10 UTC (rev 29600)
@@ -0,0 +1,109 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+
+/**
+ * Tests Rich Faces List Shuttle Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class ListShuttleTagTest extends RichFacesTagsTest{
+ @Override
+ protected void initPageContent() {
+ xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" +
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"\n" +
+ " xmlns:rich=\"http://richfaces.org/rich\"\n" +
+ " xmlns:a4j=\"http://richfaces.org/a4j\">\n" +
+ " <head>\n" +
+ " </head>\n" +
+ " <body>\n" +
+ " <f:view>\n" +
+ " <rich:listShuttle>\n" +
+ " </rich:listShuttle>\n" +
+ " </f:view>\n" +
+ " </body>\n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContainsNodeWithValue(
+ xhtmlWebBrowser,
+ "Copy all",
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(
+ xhtmlWebBrowser,
+ "Copy",
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(
+ xhtmlWebBrowser,
+ "Remove All",
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(
+ xhtmlWebBrowser,
+ "Remove",
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(
+ xhtmlWebBrowser,
+ "First",
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(
+ xhtmlWebBrowser,
+ "Up",
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(
+ xhtmlWebBrowser,
+ "Last",
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContainsNodeWithValue(
+ xhtmlWebBrowser,
+ "Down",
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "DIV",
+ new String[]{"class"},
+ new String[]{"rich-shuttle-button-content"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "TABLE",
+ new String[]{"class"},
+ new String[]{"rich-list-shuttle"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "DIV",
+ new String[]{"class"},
+ new String[]{"rich-shuttle-controls"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ assertVisualEditorContains(xhtmlWebBrowser,
+ "DIV",
+ new String[]{"class"},
+ new String[]{"rich-shuttle-control"},
+ RichFacesTagsTest.TEST_PAGE_NAME_XHTML);
+ // check tag selection
+ xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DIV",4), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = xhtmlEditor.getSelection();
+ String hasToStartWith = "<rich:listShuttle>";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ String hasEndWith = "</rich:listShuttle>";
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().endsWith(hasEndWith));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ListShuttleTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 10 months