JBoss Tools SVN: r41123 - in trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim: resources/config and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-05-17 13:07:07 -0400 (Thu, 17 May 2012)
New Revision: 41123
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-11896 : BrowserSim: pixel ratio problem
- added pixel ratio property for devices
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java 2012-05-17 16:24:06 UTC (rev 41122)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java 2012-05-17 17:07:07 UTC (rev 41123)
@@ -10,23 +10,35 @@
******************************************************************************/
package org.jboss.tools.vpe.browsersim.model;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+
/**
* @author Yahor Radtsevich (yradtsevich)
*/
public class Device {
public static final int DEFAULT_SIZE = -1;
+ public static final DecimalFormat PIXEL_RAIO_FORMAT = new DecimalFormat("0.###"); //$NON-NLS-1$
+ static {
+ DecimalFormatSymbols formatSymbols = new DecimalFormatSymbols();
+ formatSymbols.setDecimalSeparator('.');
+ PIXEL_RAIO_FORMAT.setDecimalFormatSymbols(formatSymbols);
+ }
private String name;
private int width;
private int height;
+ private double pixelRatio;
private String userAgent;
private String skinId;
- public Device(String name, int width, int height, String userAgent, String skinId) {
+
+ public Device(String name, int width, int height, double pixelRatio, String userAgent, String skinId) {
this.name = name;
this.width = width;
this.height = height;
+ this.pixelRatio = pixelRatio;
this.userAgent = userAgent;
this.skinId = skinId;
}
@@ -50,4 +62,8 @@
public String getSkinId() {
return skinId;
}
+
+ public double getPixelRatio() {
+ return pixelRatio;
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java 2012-05-17 16:24:06 UTC (rev 41122)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java 2012-05-17 17:07:07 UTC (rev 41123)
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
@@ -34,7 +35,7 @@
private static final String DEFAULT_PREFERENCES_RESOURCE = "config/devices.cfg";
private static final String USER_PREFERENCES_FOLDER = "org.jboss.tools.vpe.browsersim";
private static final String USER_PREFERENCES_FILE = "devices.cfg";
- private static final int CURRENT_CONFIG_VERSION = 5;
+ private static final int CURRENT_CONFIG_VERSION = 6;
public static void saveUserDefinedDevicesList(DevicesList devicesList) {
File configFolder = new File(USER_PREFERENCES_FOLDER);
@@ -72,7 +73,7 @@
}
if (devicesList == null) {
- Device device = new Device("Default", 1024, 768, null, null);
+ Device device = new Device("Default", 1024, 768, 1.0, null, null);
List<Device> devices = new ArrayList<Device>();
devices.add(device);
devicesList = new DevicesList(devices, 0, true, null);
@@ -98,6 +99,8 @@
writer.write('\t');
writer.write(encode( String.valueOf(device.getHeight()) ));
writer.write('\t');
+ writer.write(encode( Device.PIXEL_RAIO_FORMAT.format(device.getPixelRatio()) ));
+ writer.write('\t');
if (device.getUserAgent() != null) {
writer.write( encode(device.getUserAgent() ));
}
@@ -164,21 +167,30 @@
}
}
- Pattern devicePattern = Pattern.compile("^(.*)\\t(\\-?[0-9]+)\\t(\\-?[0-9]+)\\t(.+)?\\t(.+)?$");
+ Pattern devicePattern = Pattern.compile("^(.*)\\t([0-9]+)\\t([0-9]+)\\t([0-9]*\\.?[0-9]*)\\t(.+)?\\t(.+)?$");
devices = new ArrayList<Device>();
while ((nextLine = reader.readLine()) != null) {
Matcher deviceMatcher = devicePattern.matcher(nextLine);
if (deviceMatcher.matches()) {
+ double pixelRatio;
+ try {
+ pixelRatio = Device.PIXEL_RAIO_FORMAT.parse(deviceMatcher.group(4)).doubleValue();
+ } catch (ParseException e) {
+ pixelRatio = 1.0;
+ e.printStackTrace();
+ }
+
devices.add(new Device(
decode(deviceMatcher.group(1)),
Integer.parseInt(deviceMatcher.group(2)),
Integer.parseInt(deviceMatcher.group(3)),
- deviceMatcher.group(4) != null
- ? decode(deviceMatcher.group(4))
+ pixelRatio,
+ deviceMatcher.group(5) != null
+ ? decode(deviceMatcher.group(5))
: null,
- deviceMatcher.group(5) != null
- ? decode(deviceMatcher.group(5))
+ deviceMatcher.group(6) != null
+ ? decode(deviceMatcher.group(6))
: null
));
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-05-17 16:24:06 UTC (rev 41122)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-05-17 17:07:07 UTC (rev 41123)
@@ -1,12 +1,12 @@
-ConfigVersion=5
+ConfigVersion=6
SelectedDeviceIndex=2
UseSkins=true
TruncateWindow=
-Desktop (Default User-Agent) 1024 768
-Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 iPhone 4
-Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 iPhone 3
-Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 iPhone 4
-RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Android
-Samsung Galaxy S 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android
-Samsung Galaxy S II 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android
-Samsung Galaxy Tab 10.1 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Android
+Desktop (Default User-Agent) 1024 768 1
+Apple iPad 2 768 1024 1 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 iPhone 4
+Apple iPhone 3 320 480 1 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 iPhone 3
+Apple iPhone 4 640 960 2 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 iPhone 4
+RIM BlackBerry Bold Touch 9900 640 480 1 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Android
+Samsung Galaxy S 480 800 1.5 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android
+Samsung Galaxy S II 480 800 1.5 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android
+Samsung Galaxy Tab 10.1 800 1280 1 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Android
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-05-17 16:24:06 UTC (rev 41122)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-05-17 17:07:07 UTC (rev 41123)
@@ -481,15 +481,17 @@
? DeviceOrientation.PORTRAIT
: DeviceOrientation.LANDSCAPE);
Rectangle clientArea = getMonitorClientArea();
- skin.setOrientationAndSize( deviceOrientation.getOrientationAngle(), new Point(device.getWidth(), device.getHeight()),
+ Point size = getSizeInDesktopPixels(device);
+ skin.setOrientationAndSize( deviceOrientation.getOrientationAngle(), size,
getSizeAdvisor());
fixShellLocation(clientArea);
deviceOrientation.addObserver(new Observer() {
public void update(Observable o, Object arg) {
int orientationAngle = ((DeviceOrientation) o).getOrientationAngle();
-
- int minSize = Math.min(device.getWidth(), device.getHeight());
- int maxSize = Math.max(device.getWidth(), device.getHeight());
+
+ Point size = getSizeInDesktopPixels(device);
+ int minSize = Math.min(size.x, size.y);
+ int maxSize = Math.max(size.x, size.y);
Point browserSize;
if (orientationAngle == DeviceOrientation.LANDSCAPE
|| orientationAngle == DeviceOrientation.LANDSCAPE_INVERTED) {
@@ -582,6 +584,22 @@
deviceOrientation.notifyObservers();
}
+ /**
+ * See JBIDE-11896 BrowserSim: pixel ratio problem.
+ *
+ * On many mobile devices like iPhone 4 1 CSS pixel = 2 device pixels.
+ */
+ protected Point getSizeInDesktopPixels(Device device) {
+ double pixelRatio = device.getPixelRatio();
+ if (device.getPixelRatio() == 0.0) {
+ pixelRatio = 1.0;
+ new RuntimeException("Pixel Ratio is 0.0").printStackTrace();
+ }
+ int width = (int) Math.round(device.getWidth() / pixelRatio);
+ int height = (int) Math.round(device.getHeight() / pixelRatio);
+ return new Point(width, height);
+ }
+
class ControlHandlerImpl implements ControlHandler {
private Browser browser;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java 2012-05-17 16:24:06 UTC (rev 41122)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java 2012-05-17 17:07:07 UTC (rev 41123)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.vpe.browsersim.ui;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -46,6 +47,7 @@
private Text textName;
private Text textWidth;
private Text textHeight;
+ private Text textPixelRatio;
private Text textUserAgent;
private Button checkButtonWidth;
private Button checkButtonHeight;
@@ -130,6 +132,15 @@
}
attachCheckBoxToText(checkButtonHeight, textHeight);
+ Label labelPixelRatio = new Label(shell, SWT.NONE);
+ labelPixelRatio.setText(Messages.EditDeviceDialog_PIXEL_RATIO);
+ textPixelRatio = new Text(shell, SWT.BORDER);
+ textPixelRatio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+ textPixelRatio.setTextLimit(5);
+ textPixelRatio.addVerifyListener(new VerifyFloatListener());
+
+ textPixelRatio.setText(Device.PIXEL_RAIO_FORMAT.format(initialDevice.getPixelRatio()));
+
checkButtonUserAgent = new Button(shell, SWT.CHECK);
checkButtonUserAgent.setText(Messages.EditDeviceDialog_USER_AGENT);
checkButtonUserAgent.setSelection(initialDevice.getUserAgent() != null);
@@ -168,9 +179,17 @@
buttonOk.setText(Messages.EditDeviceDialog_OK);
buttonOk.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
+ double pixelRatio;
+ try {
+ pixelRatio = Device.PIXEL_RAIO_FORMAT.parse(textPixelRatio.getText()).doubleValue();
+ } catch (ParseException e1) {
+ pixelRatio = 1.0;
+ }
+
resultDevice = new Device(textName.getText(),
checkButtonWidth.getSelection() ? Integer.valueOf("0" + textWidth.getText()) : Device.DEFAULT_SIZE, //$NON-NLS-1$
checkButtonHeight.getSelection() ? Integer.valueOf("0" + textHeight.getText()) : Device.DEFAULT_SIZE, //$NON-NLS-1$
+ pixelRatio,
checkButtonUserAgent.getSelection() ? textUserAgent.getText() : null,
comboSkin.getSelectionIndex() == 0 ? null : skinIds.get(comboSkin.getSelectionIndex()));
shell.close();
@@ -206,6 +225,34 @@
}
}
+final class VerifyFloatListener implements VerifyListener {
+ public void verifyText(VerifyEvent e) {
+ for (char c : e.text.toCharArray()) {
+ if (!('0' <= c && c <= '9') && c != ',' && c != '.') {
+ e.doit = false;
+ return;
+ }
+ }
+
+ Text text = (Text) e.widget;
+ String oldText = text.getText();
+ String newText = oldText.substring(0, e.start) + e.text + oldText.substring(e.end);
+
+ int delimiterCounter = 0;
+ for (char c : newText.toCharArray()) {
+ if (c == ',' || c == '.') {
+ delimiterCounter++;
+ }
+ }
+ if (delimiterCounter > 1) {
+ e.doit = false;
+ return;
+ }
+
+ e.text = e.text.replace(',', '.');
+ }
+}
+
final class VerifyDigitsListener implements VerifyListener {
public void verifyText(VerifyEvent e) {
for (char c : e.text.toCharArray()) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java 2012-05-17 16:24:06 UTC (rev 41122)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java 2012-05-17 17:07:07 UTC (rev 41123)
@@ -90,7 +90,7 @@
*/
private void createContents() {
shell = new Shell(getParent(), getStyle());
- shell.setSize(650, 450);
+ shell.setSize(750, 500);
shell.setText(getText());
shell.setLayout(new GridLayout(1, false));
@@ -110,23 +110,27 @@
TableColumn tableColumnName = new TableColumn(table, SWT.NONE);
- tableColumnName.setWidth(100);
+ tableColumnName.setWidth(175);
tableColumnName.setText(Messages.ManageDevicesDialog_NAME);
TableColumn tableColumnWidth = new TableColumn(table, SWT.NONE);
- tableColumnWidth.setWidth(100);
+ tableColumnWidth.setWidth(75);
tableColumnWidth.setText(Messages.ManageDevicesDialog_WIDTH);
TableColumn tableColumnHeight = new TableColumn(table, SWT.NONE);
- tableColumnHeight.setWidth(100);
+ tableColumnHeight.setWidth(75);
tableColumnHeight.setText(Messages.ManageDevicesDialog_HEIGHT);
+ TableColumn tableColumnPixelRatio = new TableColumn(table, SWT.NONE);
+ tableColumnPixelRatio.setWidth(75);
+ tableColumnPixelRatio.setText(Messages.ManageDevicesDialog_PIXEL_RATIO);
+
TableColumn tableColumnUseragent = new TableColumn(table, SWT.NONE);
- tableColumnUseragent.setWidth(100);
+ tableColumnUseragent.setWidth(150);
tableColumnUseragent.setText(Messages.ManageDevicesDialog_USER_AGENT);
TableColumn tableColumnSkin = new TableColumn(table, SWT.NONE);
- tableColumnSkin.setWidth(100);
+ tableColumnSkin.setWidth(75);
tableColumnSkin.setText(Messages.ManageDevicesDialog_SKIN);
Composite compositeControls = new Composite(devicesGroup, SWT.NONE);
@@ -139,7 +143,7 @@
buttonAdd.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
Device newDevice = new EditDeviceDialog(shell, SWT.APPLICATION_MODAL | SWT.SHELL_TRIM,
- new Device(Messages.ManageDevicesDialog_NEW_DEVICE, 480, 800, Messages.ManageDevicesDialog_NEW_USER_AGENT, null)).open();
+ new Device(Messages.ManageDevicesDialog_NEW_DEVICE, 320, 480, 1.0, Messages.ManageDevicesDialog_NEW_USER_AGENT, null)).open();
if (newDevice != null) {
devices.add(newDevice);
selectedDeviceIndex = devices.size() - 1;
@@ -281,7 +285,7 @@
updateDevices();
}
- public void updateDevices() {//TODO
+ public void updateDevices() {
table.removeAll();
for (Device device : devices) {
TableItem tableItem = new TableItem(table, SWT.NONE);
@@ -289,6 +293,7 @@
device.getName(),
device.getWidth() == Device.DEFAULT_SIZE ? Messages.ManageDevicesDialog_DEFAULT : String.valueOf(device.getWidth()),
device.getHeight() == Device.DEFAULT_SIZE ? Messages.ManageDevicesDialog_DEFAULT : String.valueOf(device.getHeight()),
+ Device.PIXEL_RAIO_FORMAT.format(device.getPixelRatio()),
device.getUserAgent() == null ? Messages.ManageDevicesDialog_DEFAULT : device.getUserAgent(),
device.getSkinId() == null ? Messages.ManageDevicesDialog_NONE : device.getSkinId()
});
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java 2012-05-17 16:24:06 UTC (rev 41122)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java 2012-05-17 17:07:07 UTC (rev 41123)
@@ -17,6 +17,7 @@
*/
public class Messages {
private static final String BUNDLE_NAME = Messages.class.getName().toString().toLowerCase();
+
public static String BrowserSim_ADDRESS;
public static String BrowserSim_BROWSER_SIM;
@@ -38,6 +39,7 @@
public static String EditDeviceDialog_NAME;
public static String EditDeviceDialog_NONE;
public static String EditDeviceDialog_OK;
+ public static String EditDeviceDialog_PIXEL_RATIO;
public static String EditDeviceDialog_SKIN;
public static String EditDeviceDialog_USER_AGENT;
public static String EditDeviceDialog_WIDTH;
@@ -60,6 +62,7 @@
public static String ManageDevicesDialog_NEW_USER_AGENT;
public static String ManageDevicesDialog_NONE;
public static String ManageDevicesDialog_OK;
+ public static String ManageDevicesDialog_PIXEL_RATIO;
public static String ManageDevicesDialog_PREFERENCES;
public static String ManageDevicesDialog_PROMPT;
public static String ManageDevicesDialog_REMOVE;
@@ -77,6 +80,7 @@
public static String SizeWarningDialog_OK;
public static String SizeWarningDialog_REMEMBER_MY_DECISION;
+
static {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties 2012-05-17 16:24:06 UTC (rev 41122)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties 2012-05-17 17:07:07 UTC (rev 41123)
@@ -17,6 +17,7 @@
EditDeviceDialog_MANAGE_DEVICES=Manage Devices
EditDeviceDialog_NAME=Name:
EditDeviceDialog_NONE=None
+EditDeviceDialog_PIXEL_RATIO=Pixel Ratio:
EditDeviceDialog_OK=OK
EditDeviceDialog_SKIN=Skin:
EditDeviceDialog_USER_AGENT=User-Agent:
@@ -44,6 +45,7 @@
ManageDevicesDialog_NEW_DEVICE=New Device
ManageDevicesDialog_NEW_USER_AGENT=New User-Agent
ManageDevicesDialog_OK=OK
+ManageDevicesDialog_PIXEL_RATIO=Pixel Ratio
ManageDevicesDialog_PREFERENCES=Preferences
ManageDevicesDialog_PROMPT=Prompt
ManageDevicesDialog_REMOVE=Remove
13 years, 8 months
JBoss Tools SVN: r41122 - trunk/bpel/tests.
by jbosstools-commits＠lists.jboss.org
Author: apodhrad
Date: 2012-05-17 12:24:06 -0400 (Thu, 17 May 2012)
New Revision: 41122
Removed:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test.lib/
Modified:
trunk/bpel/tests/pom.xml
Log:
Bpel bot tests: org.jboss.tools.bpel.ui.bot.test.lib deleted because the library xmlunit was embed into bot test plugin
Modified: trunk/bpel/tests/pom.xml
===================================================================
--- trunk/bpel/tests/pom.xml 2012-05-17 16:11:52 UTC (rev 41121)
+++ trunk/bpel/tests/pom.xml 2012-05-17 16:24:06 UTC (rev 41122)
@@ -14,7 +14,6 @@
<modules>
<module>org.jboss.tools.bpel.ui.test</module>
<module>org.jboss.tools.bpel.ui.bot.test</module>
- <module>org.jboss.tools.bpel.ui.bot.test.lib</module>
</modules>
</project>
13 years, 8 months
JBoss Tools SVN: r41121 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: apodhrad
Date: 2012-05-17 12:11:52 -0400 (Thu, 17 May 2012)
New Revision: 41121
Added:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/lib/
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/lib/xmlunit-1.3.jar
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/build.properties
Log:
BPEL bot tests: the library xmlunit embed into the bot test plugin
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath 2012-05-17 15:57:37 UTC (rev 41120)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath 2012-05-17 16:11:52 UTC (rev 41121)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF 2012-05-17 15:57:37 UTC (rev 41120)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF 2012-05-17 16:11:52 UTC (rev 41121)
@@ -17,9 +17,10 @@
org.eclipse.wst.wsdl;bundle-version="1.2.103",
org.eclipse.emf.ecore;bundle-version="2.6.1",
org.jboss.tools.ui.bot.ext;bundle-version="3.2.0",
- org.eclipse.swtbot.eclipse.gef.finder;bundle-version="2.0.3",
- org.custommonkey.xmlunit;bundle-version="1.0.0"
+ org.eclipse.swtbot.eclipse.gef.finder;bundle-version="2.0.3"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Import-Package: org.eclipse.ui.internal.views.properties.tabbed.view
+Bundle-ClassPath: lib/xmlunit-1.3.jar,
+ .
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/build.properties
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/build.properties 2012-05-17 15:57:37 UTC (rev 41120)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/build.properties 2012-05-17 16:11:52 UTC (rev 41121)
@@ -2,8 +2,10 @@
bin.includes = .,\
META-INF/,\
projects/,\
- test_project.zip
+ test_project.zip,\
+ lib/xmlunit-1.3.jar
source.. = src/
src.includes = META-INF/,\
- .,\
+ .,\
build.properties
+jars.extra.classpath = lib/xmlunit-1.3.jar
Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/lib/xmlunit-1.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/lib/xmlunit-1.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 8 months
JBoss Tools SVN: r41120 - trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-17 11:57:37 -0400 (Thu, 17 May 2012)
New Revision: 41120
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizardPage.java
Log:
JBIDE-11905 - ConfigureRepositoriesWizard was incorrectly adding the repository element to the pluginRepositories element
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizardPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizardPage.java 2012-05-17 14:58:38 UTC (rev 41119)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizardPage.java 2012-05-17 15:57:37 UTC (rev 41120)
@@ -142,6 +142,8 @@
private static final String PLUGIN_REPOSITORIES_ELEMENT = "pluginRepositories"; //$NON-NLS-1$
+ private static final String PLUGIN_REPOSITORY_ELEMENT = "pluginRepository"; //$NON-NLS-1$
+
private static final String REPOSITORIES_ELEMENT = "repositories"; //$NON-NLS-1$
private static final String ACTIVE_BY_DEFAULT_ELEMENT = "activeByDefault"; //$NON-NLS-1$
@@ -618,13 +620,18 @@
}
protected void addRepository(RepositoryWrapper wrapper) {
- addRepository(wrapper, repositoriesElement);
- addRepository(wrapper, pluginRepositoriesElement);
+ addRepository(wrapper, repositoriesElement, false);
+ addRepository(wrapper, pluginRepositoriesElement, true);
}
- private void addRepository(RepositoryWrapper wrapper, Element repos) {
- Element repository = document.createElement(REPOSITORY_ELEMENT);
+ private void addRepository(RepositoryWrapper wrapper, Element repos, boolean isPluginRepository) {
+ Element repository;
+ if (isPluginRepository) {
+ repository = document.createElement(PLUGIN_REPOSITORY_ELEMENT);
+ } else {
+ repository = document.createElement(REPOSITORY_ELEMENT);
+ }
repos.appendChild(repository);
addElement(repository, ID_ELEMENT, wrapper.getRepository().getId());
addElement(repository, NAME_ELEMENT, wrapper.getRepository().getName());
@@ -658,17 +665,23 @@
protected void removeRepository(RepositoryWrapper wrapper) {
String url = wrapper.getRepository().getUrl();
- removeRepository(url, repositoriesElement);
- removeRepository(url, pluginRepositoriesElement);
+ removeRepository(url, repositoriesElement, false);
+ removeRepository(url, pluginRepositoriesElement, true);
}
- protected void removeRepository(String url, Element repos) {
+ protected void removeRepository(String url, Element repos, boolean isPluginRepository) {
NodeList repositoryNodeList = repos.getChildNodes();
int len = repositoryNodeList.getLength();
+ String name;
+ if (isPluginRepository) {
+ name = PLUGIN_REPOSITORY_ELEMENT;
+ } else {
+ name = REPOSITORY_ELEMENT;
+ }
Node repository = null;
for (int i = 0; i < len; i++) {
Node node = repositoryNodeList.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE && REPOSITORY_ELEMENT.equals(node.getNodeName())) {
+ if (node.getNodeType() == Node.ELEMENT_NODE && name.equals(node.getNodeName())) {
String urlNode = getRepositoryUrl(node);
if (urlNode != null && urlNode.equals(url)) {
repository = node;
13 years, 8 months
JBoss Tools SVN: r41119 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-05-17 10:58:38 -0400 (Thu, 17 May 2012)
New Revision: 41119
Modified:
trunk/build/aggregate/build.xml
Log:
[JBIDE-11720] Adjusted regex to match the soatools job names as well as the jbosstools names
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-05-17 14:47:19 UTC (rev 41118)
+++ trunk/build/aggregate/build.xml 2012-05-17 14:58:38 UTC (rev 41119)
@@ -525,10 +525,10 @@
<isset property="BUILD_ALIAS" />
</and>
<then>
- <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" />
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" />
</then>
<else>
- <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" />
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" />
</else>
</if>
</then>
13 years, 8 months
JBoss Tools SVN: r41118 - in trunk/esb/tests/org.jboss.tools.esb.ui.bot.test: .settings and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-05-17 10:47:19 -0400 (Thu, 17 May 2012)
New Revision: 41118
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.classpath
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.project
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/esb.ui.bot.tests.launch
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/org.jboss.tools.esb.ui.bot.test.properties
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/requirements.properties
Log:
Updated org.jboss.tools.esb.ui.bot.test/requirements.properties to reference soap - see: https://issues.jboss.org/browse/JBDS-2003
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.classpath
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.classpath 2012-05-17 14:10:00 UTC (rev 41117)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.classpath 2012-05-17 14:47:19 UTC (rev 41118)
@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.jboss.tools.ui.bot.ext"/>
+ <classpathentry kind="lib" path="/jboss/local/hamcrest/hamcrest-all-1.3.0RC2.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.project
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.project 2012-05-17 14:10:00 UTC (rev 41117)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.project 2012-05-17 14:47:19 UTC (rev 41118)
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
@@ -25,10 +30,18 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.settings/org.eclipse.jdt.core.prefs 2012-05-17 14:10:00 UTC (rev 41117)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.settings/org.eclipse.jdt.core.prefs 2012-05-17 14:47:19 UTC (rev 41118)
@@ -1,8 +1,11 @@
-#Mon Aug 31 15:12:26 CEST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/esb.ui.bot.tests.launch
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/esb.ui.bot.tests.launch 2012-05-17 14:10:00 UTC (rev 41117)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/esb.ui.bot.tests.launch 2012-05-17 14:47:19 UTC (rev 41118)
@@ -26,9 +26,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DISPLAY" value=":1"/>
-</mapAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
@@ -40,7 +37,7 @@
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx512m -Dswtbot.test.properties.file=${env_var:HOME}/swtbot.properties -Dusage_reporting_enabled=false"/>
<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/org.jboss.tools.esb.ui.bot.test.properties
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/org.jboss.tools.esb.ui.bot.test.properties 2012-05-17 14:10:00 UTC (rev 41117)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/org.jboss.tools.esb.ui.bot.test.properties 2012-05-17 14:47:19 UTC (rev 41118)
@@ -1 +1,3 @@
-ESB=4.7,${jbosstools.test.jbossesb.home}
+ESB=4.11,${jbosstools.test.jbossesb.home}
+#SERVER=SOA,5.2,default,/jboss/local/redhat_svn/jbds/jbosstools/requirements/target/jboss-soa-p-5/jboss-as
+SERVER=SOA,5.3,default,${jbosstools.test.jbosssoa.home}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-05-17 14:10:00 UTC (rev 41117)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-05-17 14:47:19 UTC (rev 41118)
@@ -12,9 +12,10 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <jbosstools.test.jbossesb.home>${requirement.build.root}/jbossesb-4.7</jbosstools.test.jbossesb.home>
+ <jbosstools.test.jbossesb.home>${requirement.build.root}/jbossesb-4.11</jbosstools.test.jbossesb.home>
+ <jbosstools.test.jbosssoa.home>${requirement.build.root}/jboss-soa-p-5.3/jboss-soa-p-5/jboss-as</jbosstools.test.jbosssoa.home>
<swtbot.test.properties.file>./org.jboss.tools.esb.ui.bot.test.properties</swtbot.test.properties.file>
- <systemProperties>-Djbosstools.test.jbossesb.home=${jbosstools.test.jbossesb.home} -Dswtbot.test.properties.file=${swtbot.test.properties.file}
+ <systemProperties>-Djbosstools.test.jbossesb.home=${jbosstools.test.jbossesb.home} -Djbosstools.test.jbosssoa.home=${jbosstools.test.jbosssoa.home} -Dswtbot.test.properties.file=${swtbot.test.properties.file}
</systemProperties>
</properties>
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/requirements.properties
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/requirements.properties 2012-05-17 14:10:00 UTC (rev 41117)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/requirements.properties 2012-05-17 14:47:19 UTC (rev 41118)
@@ -1 +1 @@
-requirements=jbossesb
+requirements=jbossesb,soap
13 years, 8 months
JBoss Tools SVN: r41117 - trunk/documentation/whatsnew/maven.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-17 10:10:00 -0400 (Thu, 17 May 2012)
New Revision: 41117
Modified:
trunk/documentation/whatsnew/maven/maven-news-3.3.0.Beta3.html
Log:
JBIDE-11761 - Maven Integration in JBT 3.3.0 Beta 3 N&N
Modified: trunk/documentation/whatsnew/maven/maven-news-3.3.0.Beta3.html
===================================================================
--- trunk/documentation/whatsnew/maven/maven-news-3.3.0.Beta3.html 2012-05-17 14:09:51 UTC (rev 41116)
+++ trunk/documentation/whatsnew/maven/maven-news-3.3.0.Beta3.html 2012-05-17 14:10:00 UTC (rev 41117)
@@ -90,12 +90,13 @@
<tr>
<td valign="top" align="left">
- <a name="itemname3" id="itemname3"></a><b>Automatic Source Lookup plugin</b></td>
+ <a name="itemname3" id="itemname3"></a><b>JBoss Source Lookup</b></td>
<td valign="top">
- <p>TODO Snjeza</p>
+ <p>See <a href="https://community.jboss.org/en/tools/blog/2012/01/24/jboss-source-lookup">JBoss Source Lookup</a> for more details.
+ </p>
<p>
<small>
- See <a href="https://issues.jboss.org/browse/JBIDE-9688">JBIDE-9688</a> for more details.
+ Related <a href="https://issues.jboss.org/browse/JBIDE-9309">jira</a>.
</small>
</p>
</td>
13 years, 8 months
JBoss Tools SVN: r41116 - trunk/bpel/tests.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-05-17 10:09:51 -0400 (Thu, 17 May 2012)
New Revision: 41116
Modified:
trunk/bpel/tests/pom.xml
Log:
[JBIDE-11902] Added module for building lib
Modified: trunk/bpel/tests/pom.xml
===================================================================
--- trunk/bpel/tests/pom.xml 2012-05-17 13:53:53 UTC (rev 41115)
+++ trunk/bpel/tests/pom.xml 2012-05-17 14:09:51 UTC (rev 41116)
@@ -14,6 +14,7 @@
<modules>
<module>org.jboss.tools.bpel.ui.test</module>
<module>org.jboss.tools.bpel.ui.bot.test</module>
+ <module>org.jboss.tools.bpel.ui.bot.test.lib</module>
</modules>
</project>
13 years, 8 months
JBoss Tools SVN: r41115 - in trunk: download.jboss.org/jbosstools/builds/cascade and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-17 09:53:53 -0400 (Thu, 17 May 2012)
New Revision: 41115
Modified:
trunk/build/pom-soa-tooling.xml
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
runtime-soa build requires esb, flow, jbpm, and drools (binary upstream)
Modified: trunk/build/pom-soa-tooling.xml
===================================================================
--- trunk/build/pom-soa-tooling.xml 2012-05-17 13:53:47 UTC (rev 41114)
+++ trunk/build/pom-soa-tooling.xml 2012-05-17 13:53:53 UTC (rev 41115)
@@ -160,6 +160,10 @@
<module>../seam</module>
<module>../usage</module>
<module>../runtime</module>
+ <module>../esb</module>
+ <module>../flow</module>
+ <module>../jbpm</module>
+ <!-- also needs drools but that's only available as binary upstream so be sure to build it first and resolve from composite staging site -->
<module>../runtime-soa</module>
</modules>
</profile>
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-05-17 13:53:47 UTC (rev 41114)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-05-17 13:53:53 UTC (rev 41115)
@@ -1,4 +1,4 @@
-Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2012/05/08
+Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2012/05/17
See also https://svn.jboss.org/repos/jbosstools/trunk/build/ -> pom*.xml
@@ -58,7 +58,7 @@
bpel -> as, archives, jmx, common, tests
esb -> as, jst, common, tests
jbpm -> flow, common -> tests
-runtime-soa -> runtime
+runtime-soa -> runtime, jbpm, flow, esb, as (also needs drools as binary upstream; resolve from staging composite site)
teiid, modeshape -> tests
(also includes SwitchYard, Drools, Savara)
13 years, 8 months
JBoss Tools SVN: r41114 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-17 09:53:47 -0400 (Thu, 17 May 2012)
New Revision: 41114
Modified:
trunk/build/target-platform/contentXml2artifactVersions.xsl
Log:
JBIDE-11814 ensure that largest IU version found is the one added to the TP when regenerating with contentXml2artifactVersions.xsl
Modified: trunk/build/target-platform/contentXml2artifactVersions.xsl
===================================================================
--- trunk/build/target-platform/contentXml2artifactVersions.xsl 2012-05-17 13:49:07 UTC (rev 41113)
+++ trunk/build/target-platform/contentXml2artifactVersions.xsl 2012-05-17 13:53:47 UTC (rev 41114)
@@ -8,7 +8,12 @@
<xsl:template match="repository">
<xsl:apply-templates select="//unit" />
</xsl:template>
-<xsl:template match="//unit"><xsl:for-each select="."><xsl:sort select="@version" order="descending" case-order="lower-first" data-type="qname"/><xsl:value-of select="@id" />.version=<xsl:value-of select="@version" />
+<xsl:template match="/"><xsl:for-each select="//unit">
+<xsl:sort select="@id" order="ascending" case-order="lower-first"/><xsl:sort select="@version" order="descending" case-order="lower-first" data-type="qname"/><xsl:value-of select="@id" />.version=<xsl:value-of select="@version" />
+<xsl:variable name="thisID" select="@id"/>
+<xsl:if test="count(//unit[@id = $thisID]) > 1">
+# Warning: <xsl:value-of select="count(//unit[@id = $thisID])"/> versions found for <xsl:value-of select="@id" />:<xsl:for-each select="//unit[@id = $thisID]"><xsl:sort select="@id" order="ascending" case-order="lower-first"/><xsl:sort select="@version" order="descending" case-order="lower-first" data-type="qname"/>
+# <xsl:value-of select="@id" />.version=<xsl:value-of select="@version" /></xsl:for-each></xsl:if>
#
</xsl:for-each></xsl:template>
</xsl:stylesheet>
13 years, 8 months