JBoss Tools SVN: r41545 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2012-05-30 14:59:12 -0400 (Wed, 30 May 2012)
New Revision: 41545
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java
Log:
JBIDE-11683 - Enable defining runtime download using external xml file
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java 2012-05-30 18:53:15 UTC (rev 41544)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java 2012-05-30 18:59:12 UTC (rev 41545)
@@ -46,7 +46,13 @@
// see pom.xml for actual value -- this is passed it at build-time via Maven
private static final String JBOSS_DIRECTORY_URL;
+
+ private static final String JBOSS_RUNTIME_URL_DEFAULT = "http://download.jboss.org/examples/download_runtimes.xml"; //$NON-NLS-1$
+ private static final String JBOSS_RUNTIME_DIRECTORY = "jboss.runtime.directory.url"; //$NON-NLS-1$
+
+ private static final String JBOSS_RUNTIME_URL;
+
static {
ResourceBundle rb = ResourceBundle.getBundle("org.jboss.tools.project.examples.configurators.discovery"); //$NON-NLS-1$
String url = rb.getString("discovery.url").trim(); //$NON-NLS-1$
@@ -56,6 +62,13 @@
} else {
JBOSS_DIRECTORY_URL = url;
}
+ url = rb.getString("runtime.url").trim(); //$NON-NLS-1$
+ if ("".equals(url) || "${jboss.runtime.directory.url}".equals(url)){ //$NON-NLS-1$//$NON-NLS-2$
+ //was not filtered, fallback to default value
+ JBOSS_RUNTIME_URL = JBOSS_RUNTIME_URL_DEFAULT;
+ } else {
+ JBOSS_RUNTIME_URL = url;
+ }
}
private static final String TWITTER_LINK ="http://twitter.com/#!/jbosstools"; //$NON-NLS-1$
@@ -64,7 +77,6 @@
private static final String NEWS_URL = "http://planet.jboss.org/feeds/news"; //$NON-NLS-1$
- private static final String DOWNLOAD_RUNTIMES_URL = "http://download.jboss.org/examples/download_runtimes.xml"; //$NON-NLS-1$
private Image headerImage;
@Override
@@ -115,6 +127,12 @@
@Override
public String getDownloadRuntimesURL() {
- return DOWNLOAD_RUNTIMES_URL;
+ // use commandline override -Djboss.runtime.directory.url
+ String directory = System.getProperty(JBOSS_RUNTIME_DIRECTORY, null);
+ if (directory == null) {
+ // else use Maven-generated value (or fall back to default)
+ return JBOSS_DIRECTORY_URL;
+ }
+ return directory;
}
}
12 years, 7 months
JBoss Tools SVN: r41544 - trunk/build/aggregate/soa-site/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-05-30 14:53:15 -0400 (Wed, 30 May 2012)
New Revision: 41544
Modified:
trunk/build/aggregate/soa-site/site/associate.properties
Log:
add new juno m6 soa-tooling composite reqs site (includes bpel/bpmn) to trunk site for soa tooling
Modified: trunk/build/aggregate/soa-site/site/associate.properties
===================================================================
--- trunk/build/aggregate/soa-site/site/associate.properties 2012-05-30 18:48:37 UTC (rev 41543)
+++ trunk/build/aggregate/soa-site/site/associate.properties 2012-05-30 18:53:15 UTC (rev 41544)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/juno/M6/,http://download.jboss.org/jbosstools/updates/development/juno/
+associate.sites=http://download.jboss.org/jbosstools/updates/juno/soa-tooling/M6/,http://download.jboss.org/jbosstools/updates/juno/M6/,http://download.jboss.org/jbosstools/updates/development/juno/
12 years, 7 months
JBoss Tools SVN: r41543 - in trunk/download.jboss.org/jbosstools/updates: indigo/soa-tooling/SR2 and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-05-30 14:48:37 -0400 (Wed, 30 May 2012)
New Revision: 41543
Added:
trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/
trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/M6/
trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/M6/composite...
trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/M6/composite...
trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/compositeArt...
trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/compositeCon...
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/compos...
trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/compos...
trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/compositeA...
trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/compositeC...
Log:
add Juno M6 composites for SOA Tooling; rename site titles for Indigo ('SOA Tools' is simpler than 'JBoss Tools - SOA Tooling')
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/compos...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/compos... 2012-05-30 18:27:20 UTC (rev 41542)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/compos... 2012-05-30 18:48:37 UTC (rev 41543)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror - SOA Tooling' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<repository name='SOA Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
<property name='p2.timestamp' value='1337980182000'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/compos...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/compos... 2012-05-30 18:27:20 UTC (rev 41542)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/compos... 2012-05-30 18:48:37 UTC (rev 41543)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror - SOA Tooling' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<repository name='SOA Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
<property name='p2.timestamp' value='1337980178000'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/compositeA...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/compositeA... 2012-05-30 18:27:20 UTC (rev 41542)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/compositeA... 2012-05-30 18:48:37 UTC (rev 41543)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo Mirror - SOA Tooling' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<repository name='SOA Tools Requirements - Composite Indigo Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
<!--
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/compositeC...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/compositeC... 2012-05-30 18:27:20 UTC (rev 41542)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/compositeC... 2012-05-30 18:48:37 UTC (rev 41543)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo Mirror - SOA Tooling' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<repository name='SOA Tools Requirements - Composite Indigo Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
<!--
Copied: trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/M6/composite... (from rev 41541, trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/compos...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/M6/composite... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/M6/composite... 2012-05-30 18:48:37 UTC (rev 41543)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='SOA Tools Requirements - Composite Juno M6 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1337980182000'/>
+</properties>
+<children size='2'>
+<child location='../../../requirements/bpel/1.0.0.v20120518-1552-H175-CI/'/>
+<child location='../../../requirements/bpmn2-modeler/201202231559/'/>
+</children>
+</repository>
+
Copied: trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/M6/composite... (from rev 41541, trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/compos...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/M6/composite... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/M6/composite... 2012-05-30 18:48:37 UTC (rev 41543)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='SOA Tools Requirements - Composite Juno M6 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1337980182000'/>
+</properties>
+<children size='2'>
+<child location='../../../requirements/bpel/1.0.0.v20120518-1552-H175-CI/'/>
+<child location='../../../requirements/bpmn2-modeler/201202231559/'/>
+</children>
+</repository>
+
Copied: trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/compositeArt... (from rev 41541, trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/compositeA...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/compositeArt... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/compositeArt... 2012-05-30 18:48:37 UTC (rev 41543)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='SOA Tools Requirements - Composite Juno Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
+-->
+<property name='p2.timestamp' value='1331663937000'/>
+</properties>
+<children size='1'>
+<child location='M6/'/>
+</children>
+</repository>
Copied: trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/compositeCon... (from rev 41541, trunk/download.jboss.org/jbosstools/updates/indigo/soa-tooling/compositeC...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/compositeCon... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/juno/soa-tooling/compositeCon... 2012-05-30 18:48:37 UTC (rev 41543)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='SOA Tools Requirements - Composite Juno Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
+-->
+<property name='p2.timestamp' value='1331663946000'/>
+</properties>
+<children size='1'>
+<child location='M6/'/>
+</children>
+</repository>
12 years, 7 months
JBoss Tools SVN: r41542 - branches/jbosstools-3.3.x/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2012-05-30 14:27:20 -0400 (Wed, 30 May 2012)
New Revision: 41542
Modified:
branches/jbosstools-3.3.x/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java
Log:
https://issues.jboss.org/browse/JBIDE-12050 - Unable to Run Browsersim
https://issues.jboss.org/browse/JBIDE-11923 - BrowserSim cannot start on Ubuntu with Eclipse 3.7.2 installed by package manager
Modified: branches/jbosstools-3.3.x/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java
===================================================================
--- branches/jbosstools-3.3.x/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java 2012-05-30 18:21:46 UTC (rev 41541)
+++ branches/jbosstools-3.3.x/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java 2012-05-30 18:27:20 UTC (rev 41542)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.osgi.framework.internal.core.BundleFragment;
import org.eclipse.osgi.framework.internal.core.BundleHost;
+import org.jboss.tools.vpe.browsersim.browser.PlatformUtil;
import org.jboss.tools.vpe.browsersim.eclipse.Activator;
import org.jboss.tools.vpe.browsersim.eclipse.callbacks.BrowserSimCallback;
import org.jboss.tools.vpe.browsersim.eclipse.callbacks.OpenFileCallback;
@@ -36,10 +37,17 @@
public class BrowserSimLauncher {
public static final String BROWSERSIM_CLASS_NAME = "org.jboss.tools.vpe.browsersim.ui.BrowserSim"; //$NON-NLS-1$
private static final BrowserSimCallback[] BROWSERSIM_CALLBACKS = { new ViewSourceCallback(), new OpenFileCallback() };
- private static final String[] REQUIRED_PLUGINS = {
+ private static final String[] REQUIRED_BUNDLES = {
"org.jboss.tools.vpe.browsersim",
"org.jboss.tools.vpe.browsersim.browser",
- "org.eclipse.swt"};
+ "org.eclipse.swt"
+ };
+ private static final String[] OPTIONAL_BUNDLES = {
+
+ // org.eclipse.swt plugin may contain this fragment in itself - that is why it is optional. See JBIDE-11923
+ "org.eclipse.swt." + PlatformUtil.CURRENT_PLATFORM
+ };
+
public static void launchBrowserSim(String initialUrl) {
try {
@@ -106,9 +114,20 @@
private static String getClassPathString() throws IOException {
List<Bundle> classPathBundles = new ArrayList<Bundle>();
- for (String requiredPlugin : REQUIRED_PLUGINS) {
- classPathBundles.addAll(getBundleAndFragments(requiredPlugin));
+ for (String bundleName : REQUIRED_BUNDLES) {
+ Bundle bundle = Platform.getBundle(bundleName);
+ if (bundle != null) {
+ classPathBundles.add(bundle);
+ } else {
+ throw new IOException("Cannot find bundle: " + bundleName);
+ }
}
+ for (String bundleName : OPTIONAL_BUNDLES) {
+ Bundle bundle = Platform.getBundle(bundleName);
+ if (bundle != null) {
+ classPathBundles.add(bundle);
+ }
+ }
String pathSeparator = System.getProperty("path.separator"); //$NON-NLS-1$
StringBuilder classPath = new StringBuilder();
@@ -123,23 +142,21 @@
return classPath.toString();
}
- private static List<Bundle> getBundleAndFragments(String symbolicName) throws IOException {
+ private static List<Bundle> getBundleAndFragments(String symbolicName) {
List<Bundle> bundles = new ArrayList<Bundle>();
Bundle bundle = Platform.getBundle(symbolicName);
- if (bundle == null) {
- throw new IOException("Cannot find bundle: " + symbolicName);
- }
+ if (bundle != null) {
+ bundles.add(bundle);
+
+ if (bundle instanceof BundleHost) {
+ BundleFragment[] fragments = ((BundleHost) bundle).getFragments();
+ if (fragments != null) {
+ Collections.addAll(bundles, fragments);
+ }
+ }
+ }
- bundles.add(bundle);
-
- if (bundle instanceof BundleHost) {
- BundleFragment[] fragments = ((BundleHost) bundle).getFragments();
- if (fragments != null) {
- Collections.addAll(bundles, fragments);
- }
- }
-
return bundles;
}
12 years, 7 months
JBoss Tools SVN: r41541 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.
by jbosstools-commits@lists.jboss.org
Author: ldimaggio
Date: 2012-05-30 14:21:46 -0400 (Wed, 30 May 2012)
New Revision: 41541
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
Log:
Updated ESBExampleTest.java to reflect change in UI:
String ret = "ESB for JBoss Enterprise SOA Platform ";
//String ret = "ESB for SOA-P ";
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-30 17:25:34 UTC (rev 41540)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-30 18:21:46 UTC (rev 41541)
@@ -222,7 +222,9 @@
* @return
*/
protected String getRunningSoaVersionTreeLabel() {
- String ret = "ESB for SOA-P ";
+ String ret = "ESB for JBoss Enterprise SOA Platform ";
+ //String ret = "ESB for SOA-P ";
+
if (!configuredState.getServer().isConfigured) {
throw new NullPointerException("No server was configured for test, but it is required");
}
12 years, 7 months
JBoss Tools SVN: r41540 - in trunk/common/plugins: org.jboss.tools.common.validation and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2012-05-30 13:25:34 -0400 (Wed, 30 May 2012)
New Revision: 41540
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
trunk/common/plugins/org.jboss.tools.common.validation/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-10738 As-you-type EL validation
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2012-05-30 17:20:50 UTC (rev 41539)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2012-05-30 17:25:34 UTC (rev 41540)
@@ -124,7 +124,7 @@
Set<ELReference> references = new HashSet<ELReference>();
if(elReferenceSet != null) {
for (ELReference ref: elReferenceSet) {
- if(ref.getStartPosition()>=region.getOffset() && (ref.getStartPosition() + ref.getLength()<=region.getOffset() + region.getLength())) {
+ if(region.getOffset() + region.getLength() >= ref.getStartPosition() && region.getOffset() <= ref.getStartPosition() + ref.getLength()) {
references.add(ref);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.validation/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/plugin.xml 2012-05-30 17:20:50 UTC (rev 41539)
+++ trunk/common/plugins/org.jboss.tools.common.validation/plugin.xml 2012-05-30 17:25:34 UTC (rev 41540)
@@ -61,7 +61,7 @@
</validator>
</extension>
- <!-- extension point="org.eclipse.wst.sse.ui.sourcevalidation">
+ <extension point="org.eclipse.wst.sse.ui.sourcevalidation">
<validator
scope="partial"
class="org.jboss.tools.common.validation.AsYouTypeValidatorManager"
@@ -79,6 +79,12 @@
id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/>
</contentTypeIdentifier>
+ <contentTypeIdentifier id="org.eclipse.wst.xml.core.xmlsource">
+ <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
+ </contentTypeIdentifier>
+ <contentTypeIdentifier id="org.eclipse.core.runtime.xml">
+ <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
+ </contentTypeIdentifier>
<contentTypeIdentifier
id="org.jboss.tools.jst.jsp.jspincludesource">
</contentTypeIdentifier>
@@ -88,11 +94,11 @@
<contentTypeIdentifier
id="org.eclipse.jst.jsp.core.tagsource">
</contentTypeIdentifier>
- <contentTypeIdentifier
- id="org.eclipse.jdt.core.javaSource">
+ <contentTypeIdentifier id="org.eclipse.jdt.core.javaSource">
+ <partitionType id="__java_string"/>
</contentTypeIdentifier>
</validator>
- </extension -->
+ </extension>
<extension
id="JBTValidationProblem"
12 years, 7 months
JBoss Tools SVN: r41539 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2012-05-30 13:20:50 -0400 (Wed, 30 May 2012)
New Revision: 41539
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java
Log:
https://issues.jboss.org/browse/JBIDE-12050 - Unable to Run Browsersim
https://issues.jboss.org/browse/JBIDE-11923 - BrowserSim cannot start on Ubuntu with Eclipse 3.7.2 installed by package manager
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java 2012-05-30 16:05:11 UTC (rev 41538)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java 2012-05-30 17:20:50 UTC (rev 41539)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.osgi.framework.internal.core.BundleFragment;
import org.eclipse.osgi.framework.internal.core.BundleHost;
+import org.jboss.tools.vpe.browsersim.browser.PlatformUtil;
import org.jboss.tools.vpe.browsersim.eclipse.Activator;
import org.jboss.tools.vpe.browsersim.eclipse.callbacks.BrowserSimCallback;
import org.jboss.tools.vpe.browsersim.eclipse.callbacks.OpenFileCallback;
@@ -36,10 +37,17 @@
public class BrowserSimLauncher {
public static final String BROWSERSIM_CLASS_NAME = "org.jboss.tools.vpe.browsersim.ui.BrowserSim"; //$NON-NLS-1$
private static final BrowserSimCallback[] BROWSERSIM_CALLBACKS = { new ViewSourceCallback(), new OpenFileCallback() };
- private static final String[] REQUIRED_PLUGINS = {
+ private static final String[] REQUIRED_BUNDLES = {
"org.jboss.tools.vpe.browsersim",
"org.jboss.tools.vpe.browsersim.browser",
- "org.eclipse.swt"};
+ "org.eclipse.swt"
+ };
+ private static final String[] OPTIONAL_BUNDLES = {
+
+ // org.eclipse.swt plugin may contain this fragment in itself - that is why it is optional. See JBIDE-11923
+ "org.eclipse.swt." + PlatformUtil.CURRENT_PLATFORM
+ };
+
public static void launchBrowserSim(String initialUrl) {
try {
@@ -106,9 +114,20 @@
private static String getClassPathString() throws IOException {
List<Bundle> classPathBundles = new ArrayList<Bundle>();
- for (String requiredPlugin : REQUIRED_PLUGINS) {
- classPathBundles.addAll(getBundleAndFragments(requiredPlugin));
+ for (String bundleName : REQUIRED_BUNDLES) {
+ Bundle bundle = Platform.getBundle(bundleName);
+ if (bundle != null) {
+ classPathBundles.add(bundle);
+ } else {
+ throw new IOException("Cannot find bundle: " + bundleName);
+ }
}
+ for (String bundleName : OPTIONAL_BUNDLES) {
+ Bundle bundle = Platform.getBundle(bundleName);
+ if (bundle != null) {
+ classPathBundles.add(bundle);
+ }
+ }
String pathSeparator = System.getProperty("path.separator"); //$NON-NLS-1$
StringBuilder classPath = new StringBuilder();
@@ -123,23 +142,21 @@
return classPath.toString();
}
- private static List<Bundle> getBundleAndFragments(String symbolicName) throws IOException {
+ private static List<Bundle> getBundleAndFragments(String symbolicName) {
List<Bundle> bundles = new ArrayList<Bundle>();
Bundle bundle = Platform.getBundle(symbolicName);
- if (bundle == null) {
- throw new IOException("Cannot find bundle: " + symbolicName);
- }
+ if (bundle != null) {
+ bundles.add(bundle);
+
+ if (bundle instanceof BundleHost) {
+ BundleFragment[] fragments = ((BundleHost) bundle).getFragments();
+ if (fragments != null) {
+ Collections.addAll(bundles, fragments);
+ }
+ }
+ }
- bundles.add(bundle);
-
- if (bundle instanceof BundleHost) {
- BundleFragment[] fragments = ((BundleHost) bundle).getFragments();
- if (fragments != null) {
- Collections.addAll(bundles, fragments);
- }
- }
-
return bundles;
}
12 years, 7 months
JBoss Tools SVN: r41538 - branches/jbosstools-3.3.x/build/aggregate/soa-site/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-05-30 12:05:11 -0400 (Wed, 30 May 2012)
New Revision: 41538
Modified:
branches/jbosstools-3.3.x/build/aggregate/soa-site/site/associate.properties
Log:
https://issues.jboss.org/browse/JBIDE-10841 add soa-tooling/SR2 site to resolve org.eclipse.bpel features when installing org.jboss.bpel
Modified: branches/jbosstools-3.3.x/build/aggregate/soa-site/site/associate.properties
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/soa-site/site/associate.properties 2012-05-30 15:35:22 UTC (rev 41537)
+++ branches/jbosstools-3.3.x/build/aggregate/soa-site/site/associate.properties 2012-05-30 16:05:11 UTC (rev 41538)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://download.jboss.org/jbosstools/updates/development/indigo/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/,http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://download.jboss.org/jbosstools/updates/development/indigo/
12 years, 7 months
JBoss Tools SVN: r41537 - branches/jbosstools-3.3.x/build/parent.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-05-30 11:35:22 -0400 (Wed, 30 May 2012)
New Revision: 41537
Modified:
branches/jbosstools-3.3.x/build/parent/pom.xml
Log:
remove reference to jbosstools-nightly-soa-tooling-tests to avoid circular dependency
Modified: branches/jbosstools-3.3.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/build/parent/pom.xml 2012-05-30 14:40:50 UTC (rev 41536)
+++ branches/jbosstools-3.3.x/build/parent/pom.xml 2012-05-30 15:35:22 UTC (rev 41537)
@@ -504,7 +504,7 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
+ <!-- remove this to avoid circular dependency <repository>
<id>jbosstools-nightly-soa-tooling-tests</id>
<url>${jbosstools-nightly-soa-tooling-tests}</url>
<layout>p2</layout>
@@ -514,7 +514,7 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository>
+ </repository> -->
</repositories>
</profile>
12 years, 7 months