bug 441610: Release- and Build-Management for Mars
https://bugs.eclipse.org/bugs/show_bug.cgi?id=441610
update rap and orbit repo for rc1
Change-Id: Ice442c6f9fa8731029efd74ee5d3d1b3c5bf7e34
Reviewed-on: https://git.eclipse.org/r/48170
Tested-by: Hudson CI
Reviewed-by: Judith Gull <jgu@bsiag.com>
diff --git a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/action/MenuSizeEstimator.java b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/action/MenuSizeEstimator.java
index 0169ba4..1523161 100644
--- a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/action/MenuSizeEstimator.java
+++ b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/action/MenuSizeEstimator.java
@@ -12,9 +12,9 @@
import java.util.List;
-import org.eclipse.rap.rwt.internal.theme.CssBoxDimensions;
import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.internal.theme.WidgetMatcher;
+import org.eclipse.rap.rwt.theme.BoxDimensions;
import org.eclipse.scout.commons.logger.IScoutLogger;
import org.eclipse.scout.commons.logger.ScoutLogManager;
import org.eclipse.scout.rt.client.ui.action.tree.IActionNode;
@@ -93,7 +93,14 @@
private class MenuThemeAdapter extends ThemeAdapter {
public Rectangle getPadding(String cssElement, Widget widget) {
- return CssBoxDimensions.createRectangle(getCssBoxDimensions(cssElement, "padding", widget));
+ return createRectangle(getCssBoxDimensions(cssElement, "padding", widget).dimensions);
+ }
+
+ private Rectangle createRectangle(BoxDimensions boxdim) {
+ return new Rectangle(boxdim.left,
+ boxdim.top,
+ boxdim.left + boxdim.right,
+ boxdim.top + boxdim.bottom);
}
public int getBorderWidth(String cssElement, Widget widget) {
diff --git a/org.eclipse.scout.target/eclipse-helios.target b/org.eclipse.scout.target/eclipse-helios.target
index c84068f..7dfb1d5 100644
--- a/org.eclipse.scout.target/eclipse-helios.target
+++ b/org.eclipse.scout.target/eclipse-helios.target
@@ -20,7 +20,7 @@
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository"/>
+ <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150513182540/repository"/>
<unit id="javax.jms" version="1.1.0.v201205091237"/>
<unit id="javax.jms.source" version="1.1.0.v201205091237"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
@@ -88,7 +88,7 @@
<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/M7-20150505-1714"/>
+ <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/RC1-20150518-2141"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.scout.target/eclipse-indigo.target b/org.eclipse.scout.target/eclipse-indigo.target
index e641624..d7c0524 100644
--- a/org.eclipse.scout.target/eclipse-indigo.target
+++ b/org.eclipse.scout.target/eclipse-indigo.target
@@ -20,7 +20,7 @@
</location>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository"/>
+ <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150513182540/repository"/>
<unit id="javax.jms" version="1.1.0.v201205091237"/>
<unit id="javax.jms.source" version="1.1.0.v201205091237"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
@@ -88,7 +88,7 @@
<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/M7-20150505-1714"/>
+ <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/RC1-20150518-2141"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.scout.target/eclipse-juno.target b/org.eclipse.scout.target/eclipse-juno.target
index 23b5128..f9db9b8 100644
--- a/org.eclipse.scout.target/eclipse-juno.target
+++ b/org.eclipse.scout.target/eclipse-juno.target
@@ -21,7 +21,7 @@
</location>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository"/>
+ <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150513182540/repository"/>
<unit id="javax.jms" version="1.1.0.v201205091237"/>
<unit id="javax.jms.source" version="1.1.0.v201205091237"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
@@ -89,7 +89,7 @@
<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/M7-20150505-1714"/>
+ <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/RC1-20150518-2141"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.scout.target/eclipse-kepler.target b/org.eclipse.scout.target/eclipse-kepler.target
index 2af0af8..5878c35 100644
--- a/org.eclipse.scout.target/eclipse-kepler.target
+++ b/org.eclipse.scout.target/eclipse-kepler.target
@@ -19,7 +19,7 @@
<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository"/>
+ <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150513182540/repository"/>
<unit id="javax.jms" version="1.1.0.v201205091237"/>
<unit id="javax.jms.source" version="1.1.0.v201205091237"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
@@ -87,7 +87,7 @@
<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/M7-20150505-1714"/>
+ <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/RC1-20150518-2141"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.scout.target/eclipse-luna.target b/org.eclipse.scout.target/eclipse-luna.target
index 1425894..722b7c7 100644
--- a/org.eclipse.scout.target/eclipse-luna.target
+++ b/org.eclipse.scout.target/eclipse-luna.target
@@ -20,7 +20,7 @@
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository"/>
+ <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150513182540/repository"/>
<unit id="javax.jms" version="1.1.0.v201205091237"/>
<unit id="javax.jms.source" version="1.1.0.v201205091237"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
@@ -88,7 +88,7 @@
<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/M7-20150505-1714"/>
+ <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/RC1-20150518-2141"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.scout.target/eclipse-mars-integration.target b/org.eclipse.scout.target/eclipse-mars-integration.target
index c3aad52..d1f9c9c 100644
--- a/org.eclipse.scout.target/eclipse-mars-integration.target
+++ b/org.eclipse.scout.target/eclipse-mars-integration.target
@@ -26,7 +26,7 @@
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository"/>
+ <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150513182540/repository"/>
<unit id="javax.jms" version="1.1.0.v201205091237"/>
<unit id="javax.jms.source" version="1.1.0.v201205091237"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
@@ -94,7 +94,7 @@
<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/M7-20150505-1714"/>
+ <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/RC1-20150518-2141"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.scout.target/eclipse-mars.target b/org.eclipse.scout.target/eclipse-mars.target
index 501aefc..11dea4a 100644
--- a/org.eclipse.scout.target/eclipse-mars.target
+++ b/org.eclipse.scout.target/eclipse-mars.target
@@ -80,10 +80,10 @@
<unit id="com.thoughtworks.selenium.source" version="2.25.0.v201212071504"/>
<unit id="com.google.guava" version="15.0.0.v201403281430"/>
<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
-<repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository"/>
+<repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150513182540/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/M7-20150505-1714"/>
+<repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/RC1-20150518-2141"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
</location>
diff --git a/org.eclipse.scout.target/eclipse-staging.target b/org.eclipse.scout.target/eclipse-staging.target
index 9d32c4f..2792c44 100644
--- a/org.eclipse.scout.target/eclipse-staging.target
+++ b/org.eclipse.scout.target/eclipse-staging.target
@@ -20,7 +20,7 @@
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository"/>
+ <repository id="orbit_S" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150513182540/repository"/>
<unit id="javax.jms" version="1.1.0.v201205091237"/>
<unit id="javax.jms.source" version="1.1.0.v201205091237"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
@@ -88,7 +88,7 @@
<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/M7-20150505-1714"/>
+ <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/RC1-20150518-2141"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
