JBoss Tools SVN: r32172 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-18 00:16:21 -0400 (Sat, 18 Jun 2011)
New Revision: 32172
Removed:
trunk/build/hudson-jobs/
Log:
remove obsolete empty folders left behind from git
14 years, 10 months
JBoss Tools SVN: r32171 - in branches/jbosstools-3.3.0.M2/build: aggregate/soa-site and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-18 00:14:59 -0400 (Sat, 18 Jun 2011)
New Revision: 32171
Modified:
branches/jbosstools-3.3.0.M2/build/aggregate/site/pom.xml
branches/jbosstools-3.3.0.M2/build/aggregate/soa-site/pom.xml
branches/jbosstools-3.3.0.M2/build/parent/pom.xml
branches/jbosstools-3.3.0.M2/build/results/build.xml
branches/jbosstools-3.3.0.M2/build/target-platform/multiple.target
Log:
switch from builds/staging/_composite_/trunk to builds/staging/_composite_/3.3.indigo
Modified: branches/jbosstools-3.3.0.M2/build/aggregate/site/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.M2/build/aggregate/site/pom.xml 2011-06-18 04:09:47 UTC (rev 32170)
+++ branches/jbosstools-3.3.0.M2/build/aggregate/site/pom.xml 2011-06-18 04:14:59 UTC (rev 32171)
@@ -16,7 +16,7 @@
<!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs
which need to be called by Ant script later -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1>
+ <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</inputRepo1>
<inputRepos>1</inputRepos>
</properties>
Modified: branches/jbosstools-3.3.0.M2/build/aggregate/soa-site/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.M2/build/aggregate/soa-site/pom.xml 2011-06-18 04:09:47 UTC (rev 32170)
+++ branches/jbosstools-3.3.0.M2/build/aggregate/soa-site/pom.xml 2011-06-18 04:14:59 UTC (rev 32171)
@@ -16,7 +16,7 @@
<!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs
which need to be called by Ant script later -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1>
+ <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</inputRepo1>
<inputRepos>1</inputRepos>
</properties>
Modified: branches/jbosstools-3.3.0.M2/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.M2/build/parent/pom.xml 2011-06-18 04:09:47 UTC (rev 32170)
+++ branches/jbosstools-3.3.0.M2/build/parent/pom.xml 2011-06-18 04:14:59 UTC (rev 32171)
@@ -36,11 +36,11 @@
<!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</jbosstools-nightly-staging-composite>
+ <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</jbosstools-nightly-staging-composite>
<!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite>
+ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
<jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/RC2/</jboss-requirements-composite-mirror>
Modified: branches/jbosstools-3.3.0.M2/build/results/build.xml
===================================================================
--- branches/jbosstools-3.3.0.M2/build/results/build.xml 2011-06-18 04:09:47 UTC (rev 32170)
+++ branches/jbosstools-3.3.0.M2/build/results/build.xml 2011-06-18 04:14:59 UTC (rev 32171)
@@ -117,7 +117,7 @@
<property name="inputRepos" value="2" />
<property name="inputRepo1" value="file://${input.dir}/all/repo/" />
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk" />
+ <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/" />
</ant>
<ant target="collect.metadata" antfile="../aggregate/site/build.xml">
</ant>
@@ -129,7 +129,7 @@
<ant target="collect.zips" antfile="../aggregate/site/build.xml">
<property name="inputRepos" value="1" />
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <property name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk" />
+ <property name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/" />
</ant>
<ant target="collect.metadata" antfile="../aggregate/site/build.xml">
</ant>
Modified: branches/jbosstools-3.3.0.M2/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.3.0.M2/build/target-platform/multiple.target 2011-06-18 04:09:47 UTC (rev 32170)
+++ branches/jbosstools-3.3.0.M2/build/target-platform/multiple.target 2011-06-18 04:14:59 UTC (rev 32171)
@@ -9,7 +9,7 @@
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
+ <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -236,4 +236,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>
\ No newline at end of file
+</target>
14 years, 10 months
JBoss Tools SVN: r32169 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-17 22:17:22 -0400 (Fri, 17 Jun 2011)
New Revision: 32169
Modified:
trunk/build/parent/pom.xml
Log:
bump version M2 -> M3 in trunk
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-06-18 02:10:12 UTC (rev 32168)
+++ trunk/build/parent/pom.xml 2011-06-18 02:17:22 UTC (rev 32169)
@@ -15,7 +15,7 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
<scmBranch>trunk</scmBranch>
- <BUILD_ALIAS>M2</BUILD_ALIAS>
+ <BUILD_ALIAS>M3</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
14 years, 10 months
JBoss Tools SVN: r32168 - branches.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-17 22:10:12 -0400 (Fri, 17 Jun 2011)
New Revision: 32168
Added:
branches/jbosstools-3.3.0.M2/
Log:
Branch for 3.3.0.M2
14 years, 10 months
JBoss Tools SVN: r32167 - in trunk/documentation/whatsnew: cdi and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-17 15:25:15 -0400 (Fri, 17 Jun 2011)
New Revision: 32167
Modified:
trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M2.html
trunk/documentation/whatsnew/index.html
Log:
https://issues.jboss.org/browse/JBIDE-9158
Modified: trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M2.html 2011-06-17 19:21:49 UTC (rev 32166)
+++ trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M2.html 2011-06-17 19:25:15 UTC (rev 32167)
@@ -24,7 +24,7 @@
<h1>CDI/Seam 3 tools 3.3.0.M2 What's New</h1>
<p align="right"><a href="../index.html">< Main Index</a> <a
- href="../seam/seam-news-3.3.0.M2.html">Seam 2 Tools News ></a></p>
+ href="../forge/forge-news-3.3.0.M2.html">Forge Tools News ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2011-06-17 19:21:49 UTC (rev 32166)
+++ trunk/documentation/whatsnew/index.html 2011-06-17 19:25:15 UTC (rev 32167)
@@ -39,15 +39,15 @@
<td valign="top">
<!--
<p><a href="as/as-news-3.3.0.M2.html">JBoss AS Server Tools</a></p>
- <p><a href="jst/jst-news-3.3.0.M2.html">JST/JSF Tools</a></p>
<p><a href="vpe/vpe-news-3.3.0.M2.html">Visual Page Editor</a></p>
- <p><a href="cdi/cdi-news-3.3.0.M2.html">CDI/Seam 3 Tools</a></p>
<p><a href="seam/seam-news-3.3.0.M2.html">Seam 2 Tools</a></p>
<p><a href="forge/forge-news-3.3.0.M2.html">Forge Tools</a></p>
<p><a href="maven/maven-news-3.3.0.M2.html">Maven Tools</a></p>
<p><a href="examples/examples-news-3.3.0.M2.html">Project Examples</a></p>
<p><a href="deltacloud/deltacloud-news-0.2.0.M2.html">DeltaCloud Tools</a></p>
<p><a href="birt/birt-news-3.3.0.M2.html">Birt Tools</a></p> -->
+ <p><a href="jst/jst-news-3.3.0.M2.html">JST/JSF Tools</a></p>
+ <p><a href="cdi/cdi-news-3.3.0.M2.html">CDI/Seam 3 Tools</a></p>
<p><a href="ws/ws-news-1.2.2.M2.html">Webservices Tools</a></p>
<p><a href="modeshape/modeshape-news-3.3.0.M2.html">ModeShape Tools</a></p>
14 years, 10 months
JBoss Tools SVN: r32166 - in trunk/documentation/whatsnew/cdi: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-17 15:21:49 -0400 (Fri, 17 Jun 2011)
New Revision: 32166
Added:
trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M2.html
trunk/documentation/whatsnew/cdi/images/3.3.0.M2/
trunk/documentation/whatsnew/cdi/images/3.3.0.M2/seam_config_open_on.png
trunk/documentation/whatsnew/cdi/images/3.3.0.M2/seam_config_validation.png
Log:
https://issues.jboss.org/browse/JBIDE-9158
Added: trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M2.html 2011-06-17 19:21:49 UTC (rev 32166)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>CDI/Seam 3 tools 3.3.0.M2 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>CDI/Seam 3 tools 3.3.0.M2 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../seam/seam-news-3.3.0.M2.html">Seam 2 Tools News ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Seam Config</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>seam-beans.xml validation</b></p>
+ </td>
+ <td align="top">
+ <p>Seam Config XML is validated:</p>
+ <img src="images/3.3.0.M2/seam_config_validation.png"/>
+ <p>
+ <small><a href="https://jira.jboss.org/browse/JBIDE-8940">Related Jira</a></small><br/>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Hyperlinks (OpenOns)</b></p>
+ </td>
+ <td align="top">
+ <p>Beans injected into java source files and declared in Seam Config XML can now be navigated to via OpenOn.</p>
+ <img src="images/3.3.0.M2/seam_config_open_on.png"/>
+ <p>
+ <small><a href="https://jira.jboss.org/browse/JBIDE-9110">Related Jira</a></small><br/>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Seam Solder</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Seam Generic Beans</b></p>
+ </td>
+ <td align="top">
+ <p>CDI tools now supports generic beans. You can use generic beans in your project and CDI Tools won't be confused. So you will be able to use the general CDI Tools features such as validation, code completion, hyperlinks, refactoring, etc. to develop applications using generic beans as well as plan ones.</p>
+ <p>
+ <small><a href="https://jira.jboss.org/browse/JBIDE-8674">Related Jira</a></small><br/>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M2.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/documentation/whatsnew/cdi/images/3.3.0.M2/seam_config_open_on.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/cdi/images/3.3.0.M2/seam_config_open_on.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/cdi/images/3.3.0.M2/seam_config_validation.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/cdi/images/3.3.0.M2/seam_config_validation.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 10 months
JBoss Tools SVN: r32165 - trunk/ws/features/org.jboss.tools.ws.jaxrs.feature.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-06-17 15:16:55 -0400 (Fri, 17 Jun 2011)
New Revision: 32165
Modified:
trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml
Log:
[JBIDE-9191] no provider name for org.jboss.tools.ws.jaxrs.feature : Fixed
Modified: trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml 2011-06-17 18:32:11 UTC (rev 32164)
+++ trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml 2011-06-17 19:16:55 UTC (rev 32165)
@@ -2,7 +2,8 @@
<feature
id="org.jboss.tools.ws.jaxrs.feature"
label="%featureName"
- version="1.2.0.qualifier">
+ version="1.2.0.qualifier"
+ provider-name="JBoss by Red Hat">
<description>
%description
14 years, 10 months
JBoss Tools SVN: r32164 - in trunk/vpe/plugins: org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-06-17 14:32:11 -0400 (Fri, 17 Jun 2011)
New Revision: 32164
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java
Log:
JBIDE-9188: add system property to allow explicit disabling of the visual page in VPE
- introduced a command line parameter, that disables VPE
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java 2011-06-17 15:18:08 UTC (rev 32163)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java 2011-06-17 18:32:11 UTC (rev 32164)
@@ -9,6 +9,7 @@
public static String XulRunnerBrowser_cannotGetPathToXulrunner;
public static String XulRunnerBrowser_notAvailable;
public static String XulRunnerBrowser_wrongVersion;
+ public static String XulRunnerBrowser_embeddedXulRunnerIsDisabledByOption;
public static String CURRENT_PLATFORM_IS_NOT_SUPPORTED;
static {
// initialize resource bundle
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-06-17 15:18:08 UTC (rev 32163)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-06-17 18:32:11 UTC (rev 32164)
@@ -67,7 +67,12 @@
private static final String ROOT_BRANCH_NAME = ""; //$NON-NLS-1$
private static final String PREFERENCE_DISABLEOPENDURINGLOAD = "dom.disable_open_during_load"; //$NON-NLS-1$
- private static final String PREFERENCE_DISABLEWINDOWSTATUSCHANGE = "dom.disable_window_status_change"; //$NON-NLS-1$
+ private static final String PREFERENCE_DISABLEWINDOWSTATUSCHANGE = "dom.disable_window_status_change"; //$NON-NLS-1$
+
+ /* XXX: yradtsevich: these constants are duplicated
+ * in XULRunnerInitializer, see JBIDE-9188 */
+ private static final String LOAD_XULRUNNER_SYSTEM_PROPERTY = "org.jboss.tools.vpe.loadxulrunner";//$NON-NLS-1$
+ private static boolean EMBEDDED_XULRUNNER_ENABLED = !"false".equals(System.getProperty(LOAD_XULRUNNER_SYSTEM_PROPERTY)); //$NON-NLS-1$
private Browser browser = null;
private nsIWebBrowser webBrowser = null;
@@ -103,7 +108,8 @@
}
public XulRunnerBrowser(Composite parent) throws XulRunnerException {
-// initXulRunner();
+ ensureEmbeddedXulRunnerEnabled();
+
if(Platform.OS_MACOSX.equals(Platform.getOS())){
getXulRunnerPath();
}
@@ -135,17 +141,6 @@
nsITooltipListener.NS_ITOOLTIPLISTENER_IID);
}
- public synchronized void initXulRunner() throws XulRunnerException {
- String xulRunnerPath = getXulRunnerPath();
-
- if (!"true".equals(System.getProperty(XULRUNNER_INITIALIZED))) { //$NON-NLS-1$
- File file = new File(xulRunnerPath);
- mozilla.initialize(file);
- mozilla.initEmbedding(file, file, new AppFileLocProvider(file));
- System.setProperty(XULRUNNER_INITIALIZED, "true"); //$NON-NLS-1$
- }
- }
-
/**
* Decorate Widget.getDisplay()
*/
@@ -201,6 +196,7 @@
}
public synchronized static String getXulRunnerPath() throws XulRunnerException {
+ ensureEmbeddedXulRunnerEnabled();
//this function should be call
String xulRunnerPath = System.getProperty(XULRUNNER_PATH);
if (xulRunnerPath == null) {
@@ -263,6 +259,19 @@
return xulRunnerPath;
}
+
+ /**
+ * Check if embedded XULRunner is not disabled by {@link #EMBEDDED_XULRUNNER_ENABLED}
+ * system property. If it is, then throws a {@link XulRunnerException}.
+ *
+ * @see <a href="https://issues.jboss.org/browse/JBIDE-9188">JBIDE-9188</a>
+ */
+ private static void ensureEmbeddedXulRunnerEnabled() throws XulRunnerException {
+ if (!EMBEDDED_XULRUNNER_ENABLED) {
+ throw new XulRunnerException(MessageFormat.format(
+ VpeXulrunnerMessages.XulRunnerBrowser_embeddedXulRunnerIsDisabledByOption, LOAD_XULRUNNER_SYSTEM_PROPERTY));
+ }
+ }
public nsIServiceManager getServiceManager() {
return mozilla.getServiceManager();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties 2011-06-17 15:18:08 UTC (rev 32163)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties 2011-06-17 18:32:11 UTC (rev 32164)
@@ -3,4 +3,5 @@
XulRunnerBrowser_cannotGetPathToXulrunner=Cannot get path to XULRunner from bundle {0}
XulRunnerBrowser_notAvailable=nsIWebBrowser is not available
XulRunnerBrowser_wrongVersion=the version of the bundled XULRunner {0} must be >= {1} and <= {2}
-CURRENT_PLATFORM_IS_NOT_SUPPORTED=Current platform ''{0}'' is not supported.
+XulRunnerBrowser_embeddedXulRunnerIsDisabledByOption=Embedded XULRunner is disabled by the option ''-D{0}=false''
+CURRENT_PLATFORM_IS_NOT_SUPPORTED=Current platform ''{0}'' is not supported.
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java 2011-06-17 15:18:08 UTC (rev 32163)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java 2011-06-17 18:32:11 UTC (rev 32164)
@@ -13,8 +13,19 @@
private static final String XULRUNNER_PATH = "org.eclipse.swt.browser.XULRunnerPath"; //$NON-NLS-1$
private static final String XULRUNNER_ENTRY = "/xulrunner"; //$NON-NLS-1$
+
+ /* XXX: yradtsevich: these constants are duplicated
+ * in XulRunnerBrowser, see JBIDE-9188 */
+ private static final String LOAD_XULRUNNER_SYSTEM_PROPERTY = "org.jboss.tools.vpe.loadxulrunner";//$NON-NLS-1$
+ private static boolean EMBEDDED_XULRUNNER_ENABLED = !"false".equals(System.getProperty(LOAD_XULRUNNER_SYSTEM_PROPERTY)); //$NON-NLS-1$ //$NON-NLS-2$
static {
+ if (EMBEDDED_XULRUNNER_ENABLED) {
+ initializeXULRunner();
+ }
+ }
+
+ private static void initializeXULRunner() {
String xulrunnerPath = System.getProperty(XULRUNNER_PATH);
if (xulrunnerPath != null) {
File xulrunnerFile = new File(xulrunnerPath);
14 years, 10 months
JBoss Tools SVN: r32163 - trunk/documentation/whatsnew/deltacloud/images.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-17 11:18:08 -0400 (Fri, 17 Jun 2011)
New Revision: 32163
Added:
trunk/documentation/whatsnew/deltacloud/images/deltacloud.png
Log:
[JBIDE-9156] created N&N for deltacloud
Added: trunk/documentation/whatsnew/deltacloud/images/deltacloud.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/deltacloud/images/deltacloud.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 10 months