JBoss Tools SVN: r38024 - trunk/central.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-01-22 23:45:00 -0500 (Sun, 22 Jan 2012)
New Revision: 38024
Added:
trunk/central/README.Central.localhost.testing.txt
trunk/central/README.Central.milestone.testing.txt
Removed:
trunk/central/README.localhost.testing.txt
trunk/central/README.milestone.testing.txt
Log:
rename and tweak READMEs to match JBDS versions (JBDS-1959)
Added: trunk/central/README.Central.localhost.testing.txt
===================================================================
--- trunk/central/README.Central.localhost.testing.txt (rev 0)
+++ trunk/central/README.Central.localhost.testing.txt 2012-01-23 04:45:00 UTC (rev 38024)
@@ -0,0 +1,47 @@
+To build/test locally:
+
+0. Run a web server locally, so you can access central/site/target/site/jbosstools-directory.xml via an http:// URL. You have many options for this. Here's one:
+
+ su
+ cd /tmp; wget -nc http://elonen.iki.fi/code/nanohttpd/NanoHTTPD.java
+ javac NanoHTTPD.java; java NanoHTTPD -d /path/to/parent/folder/for/central/
+
+1. If you need to iterate through changes to the product/plugins/com.jboss.jbds.central plugin, you can do so, rebuild it, and reinstall it into a running JBDS instance.
+
+ Help > Install new > file:///path/to/product/site/target/site/
+
+For example, you might want to edit central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java to set a new path for JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML:
+
+ private static final String JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML = "http://localhost/central/site/target/site/jbosstools-directory.xml"; // for testing on localhost
+
+2. Rebuild:
+
+ cd /path/to/central; mvn clean install
+
+3. Verify the directory.xml file is generated, and http-accessible:
+
+ firefox http://localhost/central/site/target/site/jbosstools-directory.xml
+
+4. Verify central/site/target/site/jbosstools-directory.xml points at the updated version of the o.j.t.central plugin in /path/to/central/site/target/site/plugins/
+
+ Note: if built locally, there should be no Jenkins/Hudson buildID Hxxx number in the version suffix, eg.,
+ 1.0.0.v20120120-1459-Beta1
+ instead of
+ 1.0.0.v20120120-1459-H123-Beta1
+
+5. Launch JBDS like this:
+
+ ./eclipse -vmargs -Djboss.discovery.directory.url=file:///path/to/central/site/target/site/jbosstools-directory.xml
+ or
+ ./eclipse -vmargs -Djboss.discovery.directory.url=http://localhost/central/site/target/site/jbosstools-directory.xml
+
+6. Select 'Help > Jboss Central' (if not already loaded). Check the 'Software/Updates' tab to review contents of the discovery site (as per org.jboss.tools.central.discovery/plugin.xml). Hit the refresh icon if necessary to see changes.
+
+--
+
+To iterate through local changes:
+
+7. Change product/plugins/org.jboss.tools.central.discovery/plugin.xml.
+
+8. Repeat steps 2-6. If you rebuild the central plugin, you must reinstall it; the discovery plugin can simply be rebuilt and refreshed w/o needing to install anything new.
+
Copied: trunk/central/README.Central.milestone.testing.txt (from rev 38023, trunk/central/README.milestone.testing.txt)
===================================================================
--- trunk/central/README.Central.milestone.testing.txt (rev 0)
+++ trunk/central/README.Central.milestone.testing.txt 2012-01-23 04:45:00 UTC (rev 38024)
@@ -0,0 +1,20 @@
+JBoss Central has a "software/update" page which gets its content from a hardcoded URL, set in the org.jboss.tools.central plugin.
+
+The published (current) milestone release URL is
+
+ http://download.jboss.org/jbosstools/updates/development/indigo/jbosstool...
+
+The stable branch (upcoming milestone) URL is
+
+ http://download.jboss.org/jbosstools/updates/nightly/core/3.3.indigo/jbos...
+
+The unstable trunk URL is
+
+ http://download.jboss.org/jbosstools/updates/nightly/core/trunk/jbosstool...
+
+The same as used for all milestone releases of JBoss Tools; should you want to pull the list of available updates from a NEWER directory file (eg., during a QE cycle when there's a milestone candidate available, but the published milestone site still contains the PREVIOUS milestone), you can do so using a commmandline flag.
+
+Thus, when running Eclipse, simply pass in an alternate URL like this:
+
+ ./eclipse -vmargs -Djboss.discovery.directory.url=http://download.jboss.org/jbosstools/updates/nightly/core/3.3.indigo/jbosstools-directory.xml
+
Deleted: trunk/central/README.localhost.testing.txt
===================================================================
--- trunk/central/README.localhost.testing.txt 2012-01-23 04:44:50 UTC (rev 38023)
+++ trunk/central/README.localhost.testing.txt 2012-01-23 04:45:00 UTC (rev 38024)
@@ -1,27 +0,0 @@
-To build/test/iterate locally:
-
-0. Run a web server locally, so you can access central/site/target/site/jbosstools-directory.xml via an http:// URL. You have many options for this. Here's one:
-
- su
- cd /tmp; wget -nc http://elonen.iki.fi/code/nanohttpd/NanoHTTPD.java
- javac NanoHTTPD.java; java NanoHTTPD -d /path/to/parent/folder/for/central/
-
-1. edit central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java to set a new path for JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML:
-
- private static final String JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML = "http://localhost/central/site/target/site/jbosstools-directory.xml"; // for testing on localhost
-
-2. build central/ folder:
-
- cd /path/to/central; mvn clean install
-
-3. verify the directory.xml file is generated, and http-accessible:
-
- firefox http://localhost/central/site/target/site/jbosstools-directory.xml
-
-4. verify central/site/target/site/jbosstools-directory.xml points at the updated version of the o.j.t.central plugin in /path/to/central/site/target/site/plugins/
-
-5. install updated o.j.t.central plugin into new Eclipse instance from http://localhost/central/site/target/site/ (or local file:// path if you prefer). Restart when prompted.
-
-6. Change central/plugins/org.jboss.tools.central/plugin.xml, then repeat steps 2-5.
-
-
Deleted: trunk/central/README.milestone.testing.txt
===================================================================
--- trunk/central/README.milestone.testing.txt 2012-01-23 04:44:50 UTC (rev 38023)
+++ trunk/central/README.milestone.testing.txt 2012-01-23 04:45:00 UTC (rev 38024)
@@ -1,21 +0,0 @@
-JBoss Central has a "software/update" page which gets its content from a hardcoded URL, set in the org.jboss.tools.central plugin.
-
-The published (current) milestone release URL is
-
- http://download.jboss.org/jbosstools/updates/development/indigo/jbosstool...
-
-The stable branch (upcoming milestone) URL is
-
- http://download.jboss.org/jbosstools/updates/nightly/core/3.3.indigo/jbos...
-
-The unstable trunk URL is
-
- http://download.jboss.org/jbosstools/updates/nightly/core/trunk/jbosstool...
-
-The same as used for all milestone releases of JBoss Tools; should you want to pull the list of available updates from a NEWER directory file (eg., during a QE cycle when there's a milestone candidate available, but the published milestone site still contains the PREVIOUS milestone), you can do so using a commmandline flag.
-
-Thus, when running Eclipse or JBDS, simply pass in an alternate URL like this:
-
-./jbdevstudio -vmargs -Djboss.discovery.directory.url=http://download.jboss.org/jbosstools/updates/nightly/core/3.3.indigo/jbosstools-directory.xml
-./eclipse -vmargs -Djboss.discovery.directory.url=http://download.jboss.org/jbosstools/updates/nightly/core/3.3.indigo/jbosstools-directory.xml
-
12 years, 9 months
- 1
- 0
JBoss Tools SVN: r38023 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-01-22 23:44:50 -0500 (Sun, 22 Jan 2012)
New Revision: 38023
Modified:
trunk/build/aggregate/site/site.xml
Log:
JBDS-1959 add new com.jboss.jbds.central.discovery.feature to aggregate site
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2012-01-23 03:43:51 UTC (rev 38022)
+++ trunk/build/aggregate/site/site.xml 2012-01-23 04:44:50 UTC (rev 38023)
@@ -13,6 +13,8 @@
<feature url="features/com.jboss.jbds.product.feature_0.0.0.jar" id="com.jboss.jbds.product.feature" version="0.0.0" patch="false">
<category name="AbridgedTools" />
</feature>
+ <feature url="features/com.jboss.jbds.central.discovery.feature_0.0.0.jar" id="com.jboss.jbds.central.discovery.feature" version="0.0.0">
+ </feature>
-->
<feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0">
12 years, 9 months
- 1
- 0
JBoss Tools SVN: r38022 - in trunk/maven/docs/maven_reference_guide/en-US: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-22 22:43:51 -0500 (Sun, 22 Jan 2012)
New Revision: 38022
Added:
trunk/maven/docs/maven_reference_guide/en-US/images/maven_profile_selection/
trunk/maven/docs/maven_reference_guide/en-US/images/maven_profile_selection/maven_profile_selection_01.png
trunk/maven/docs/maven_reference_guide/en-US/images/maven_profile_selection/maven_profile_selection_02.png
trunk/maven/docs/maven_reference_guide/en-US/maven_profile_selection.xml
Modified:
trunk/maven/docs/maven_reference_guide/en-US/Book_Info.xml
trunk/maven/docs/maven_reference_guide/en-US/Maven_Integration_Guide.xml
trunk/maven/docs/maven_reference_guide/en-US/master.xml
Log:
updated with additional information concerning profile selection
Modified: trunk/maven/docs/maven_reference_guide/en-US/Book_Info.xml
===================================================================
--- trunk/maven/docs/maven_reference_guide/en-US/Book_Info.xml 2012-01-23 02:52:00 UTC (rev 38021)
+++ trunk/maven/docs/maven_reference_guide/en-US/Book_Info.xml 2012-01-23 03:43:51 UTC (rev 38022)
@@ -13,7 +13,7 @@
<edition>5.0.0</edition>
- <pubsnumber>3</pubsnumber>
+ <pubsnumber>4</pubsnumber>
<abstract>
<para>
Modified: trunk/maven/docs/maven_reference_guide/en-US/Maven_Integration_Guide.xml
===================================================================
--- trunk/maven/docs/maven_reference_guide/en-US/Maven_Integration_Guide.xml 2012-01-23 02:52:00 UTC (rev 38021)
+++ trunk/maven/docs/maven_reference_guide/en-US/Maven_Integration_Guide.xml 2012-01-23 03:43:51 UTC (rev 38022)
@@ -6,6 +6,7 @@
<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="maven_profile_selection.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="references.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="links.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Added: trunk/maven/docs/maven_reference_guide/en-US/images/maven_profile_selection/maven_profile_selection_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/maven/docs/maven_reference_guide/en-US/images/maven_profile_selection/maven_profile_selection_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/docs/maven_reference_guide/en-US/images/maven_profile_selection/maven_profile_selection_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/maven/docs/maven_reference_guide/en-US/images/maven_profile_selection/maven_profile_selection_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/maven/docs/maven_reference_guide/en-US/master.xml
===================================================================
--- trunk/maven/docs/maven_reference_guide/en-US/master.xml 2012-01-23 02:52:00 UTC (rev 38021)
+++ trunk/maven/docs/maven_reference_guide/en-US/master.xml 2012-01-23 03:43:51 UTC (rev 38022)
@@ -5,6 +5,7 @@
[<!ENTITY introduction SYSTEM "introduction.xml">
<!ENTITY tasks SYSTEM "tasks.xml">
+<!ENTITY profile_selection SYSTEM "maven_profile_selection.xml">
<!ENTITY references SYSTEM "references.xml">
<!ENTITY links SYSTEM "links.xml">
@@ -59,6 +60,7 @@
<toc/>
&introduction;
&tasks;
+ &profile_selection;
&references;
&links;
</book>
Added: trunk/maven/docs/maven_reference_guide/en-US/maven_profile_selection.xml
===================================================================
--- trunk/maven/docs/maven_reference_guide/en-US/maven_profile_selection.xml (rev 0)
+++ trunk/maven/docs/maven_reference_guide/en-US/maven_profile_selection.xml 2012-01-23 03:43:51 UTC (rev 38022)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="maven_profile_selection">
+ <title>Maven Profile Selection</title>
+ <para>
+ The <guilabel>Maven Profile selection</guilabel> interface allows for easy profile selection changes for any Maven project. The interface can be opened by selecting a Maven project in the <guilabel>Project Explorer</guilabel> and either pressing <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>P</keycap></keycombo> or right-clicking and navigating to <menuchoice><guimenuitem>Maven</guimenuitem><guimenuitem>Select Maven Profiles</guimenuitem></menuchoice>.
+ </para>
+ <figure id="maven_profile_selection_01">
+ <title>Maven profile selection screen</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/maven_profile_selection/maven_profile_selection_01.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Maven profile selection screen.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ From the <guilabel>Maven Profile selection</guilabel> screen you are able to <guibutton>Activate</guibutton> and <guibutton>Deactivate</guibutton> profiles for the selected project. All available proviles for the selected project, will be displayed in the <guilabel>Available profiles</guilabel> section. The profiles available to a project are inferred from those defined within the projects <filename>pom.xml</filename> file, the projects parent hierarchy and the content of maven user and global <filename>settings.xml</filename> files.
+ </para>
+ <para>
+ The <guilabel>Source</guilabel> column in the <guilabel>Available profiles</guilabel> section indicates where the profiles is defined. An undefined source means the profile is present in the Maven property page of the project, but there is no available definition.
+ </para>
+ <para>
+ If you have selected multiple projects for <guilabel>Maven Profile selection</guilabel>, only the commonly available profiles will be displayed in the <guilabel>Available profiles</guilabel> section. Common profiles are those defined in the <filename>settings.xml</filename> files or profiles having the same ID in the <filename>pom.xml</filename> file of all selected projects.
+ </para>
+ <note>
+ <para>
+ Changes made to common profiles, when having selected multiple projects, will not impact profiles unique to a project.
+ </para>
+ </note>
+</chapter>
12 years, 9 months
- 1
- 0
JBoss Tools SVN: r38021 - in trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests: editor/action and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-01-22 21:52:00 -0500 (Sun, 22 Jan 2012)
New Revision: 38021
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromSOA.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/action/Notifier.java
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/HelloWorld.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java
Log:
Modified ESB tests to resolve - JBQA-5832 - issues of tests generating intermittent invalid output due to re-use of JMS queue names
Extended email notification tests for tests/editor/action/Notifier.java
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromSOA.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromSOA.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/CreateRuntimeFromSOA.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -20,9 +20,10 @@
bot.text(1).setText(TestConfigurator.currentConfig.getServer().runtimeHome);
bot.sleep (3000l, "3 sleeping - " + TestConfigurator.currentConfig.getEsb().runtimeHome + " " + TestConfigurator.currentConfig.getEsb().version + " " + bot.comboBox().selection().toString());
+ System.out.println ("DEBUG - " + TestConfigurator.currentConfig.getServer().version);
System.out.println ("DEBUG - " + configuredState.getServer().bundledESBVersion);
- System.out.println ("DEBUG - " + TestConfigurator.currentConfig.getServer().version);
-
+ System.out.println ("DEBUG - " + bot.comboBox().selection().toString());
+
assertTrue("Version was not automatically selected by setting ESB home dir",bot.comboBox().selection().equals(configuredState.getServer().bundledESBVersion));
/* ldimaggi - Oct 2011 */
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/action/Notifier.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/action/Notifier.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/action/Notifier.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -70,6 +70,9 @@
Assertions.assertXmlContentExists(editor.toTextEditor().getText(), xpath);
}
private void addEmail(SWTBotEditor editor,String xpath,String... path) {
+
+ String xpathOrig = xpath;
+
SWTBotTreeItem item = SWTEclipseExt.selectTreeLocation(editor.bot(), path);
ContextMenuHelper.prepareTreeItemForContextMenu(editor.bot().tree(),item);
ContextMenuHelper.clickContextMenu(editor.bot().tree(), IDELabel.Menu.NEW,"Notify Email...");
@@ -81,7 +84,36 @@
editor.save();
xpath+="/target[@class='NotifyEmail' and @from='a' and @sendTo='b' and @subject='c']";
Assertions.assertXmlContentExists(editor.toTextEditor().getText(), xpath);
+
+ /* ldimaggi */
+ System.out.println ("DEBUG1");
+ org.jboss.tools.ui.bot.ext.SWTUtilExt.displayAllBotWidgets(bot);
+ System.out.println ("DEBUG1");
+
+ bot.textWithLabel("Host:").setText("redhat.com");
+ bot.textWithLabel("Port:").setText("25");
+ bot.textWithLabel("Username:").setText("QEuser");
+ bot.textWithLabel("Password:").setText("thepas$w0rd");
+ bot.textWithLabel("Auth:").setText("LDAP");
+
+ System.out.println ("DEBUG " + bot.section("Target Notify Email").getText());
+ //expandBarWithLabel("Target Notify Email").expandedItemCount() );
+
+ System.out.println (editor.toTextEditor().getText());
+
+ xpathOrig+="/target[@auth='LDAP' and @class='NotifyEmail' and @from='a' and @host='redhat.com' and @password='thepas$w0rd' and @port='25' and @sendTo='b' and @subject='c' and username='QEuser']";
+ //Assertions.assertXmlContentExists(editor.toTextEditor().getText(), xpath);
+
+//// <target auth="LDAP" class="NotifyEmail" from="a"
+//// host="redhat.com" password="thepas$w0rd" port="25" sendTo="b"
+//// subject="c" username="QEuser"/>
+//
+ editor.save();
+ bot.sleep(60000l);
+
}
+
+
private void addSQL(SWTBotEditor editor,String xpath,String... path) {
SWTBotTreeItem item = SWTEclipseExt.selectTreeLocation(editor.bot(), path);
ContextMenuHelper.prepareTreeItemForContextMenu(editor.bot().tree(),item);
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-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -7,6 +7,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.ExampleTest;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -145,6 +146,7 @@
util.waitForNonIgnoredJobs();
}
protected void assertProblemsView() {
+ //bot.sleep(60000l);
SWTBotTreeItem errors = ProblemsView.getErrorsNode(bot);
assertNull("Project still contain problems :"+SWTEclipseExt.getFormattedTreeNode(errors),errors);
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.ui.bot.tests.examples;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
@@ -32,5 +33,7 @@
assertNotNull("Calling ESB Send message failed, nothing appened to server log",text);
assertTrue("Calling ESB Send message failed, unexpected server output :"+text,text.contains("hello world esb"));
+ SWTTestExt.servers.removeAllProjectsFromServer();
+
}
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.ui.bot.tests.examples;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
@@ -21,6 +22,7 @@
super.executeExample();
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.helloworldaction.test","SendJMSMessage.java");
assertNotNull("Calling JMS Send message failed, nothing appened to server log",text);
- assertTrue("Calling JMS Send message failed, unexpected server output :"+text,text.contains("Hello World Action ESB invoked!"));
+ assertTrue("Calling JMS Send message failed, unexpected server output :"+text,text.contains("Hello World Action ESB invoked!"));
+ SWTTestExt.servers.removeAllProjectsFromServer();
}
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.ui.bot.tests.examples;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
@@ -17,6 +18,7 @@
}
@Override
protected void executeExample() {
+ SWTTestExt.servers.removeAllProjectsFromServer();
fail("Example execution not yet implemented");
}
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.ui.bot.tests.examples;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
@@ -19,6 +20,7 @@
protected void executeExample() {
super.executeExample();
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformcsv2xml","SendJMSMessage.java");
+ SWTTestExt.servers.removeAllProjectsFromServer();
assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("<csv-set>"));
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.ui.bot.tests.examples;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
@@ -24,6 +25,7 @@
assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Items"));
text = executeClient(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2pojo.test","ReceiveJMSMessage.java");
+ SWTTestExt.servers.removeAllProjectsFromServer();
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Items"));
}
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.ui.bot.tests.examples;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
@@ -20,6 +21,7 @@
super.executeExample();
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test","SendJMSMessage.java");
bot.sleep(Timing.time3S());
+ SWTTestExt.servers.removeAllProjectsFromServer();
assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("OrderDate"));
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.ui.bot.tests.examples;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
@@ -20,6 +21,7 @@
super.executeExample();
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2xmlsimple.test","SendJMSMessage.java");
bot.sleep(Timing.time3S());
+ SWTTestExt.servers.removeAllProjectsFromServer();
assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("<Order"));
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.ui.bot.tests.examples;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
@@ -22,6 +23,7 @@
assertTrue("Calling JMS Send message failed, unexpected server output :"+text,text.contains("Hello World Greeting for"));
text = null;
text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.webservice_consumer1.test","SendEsbMessage.java");
+ SWTTestExt.servers.removeAllProjectsFromServer();
assertNotNull("Calling ESB Send message failed, nothing appened to server log",text);
assertTrue("Calling ESB Send message failed, unexpected server output :"+text,text.contains("Hello World Greeting for"));
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java 2012-01-22 18:05:50 UTC (rev 38020)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java 2012-01-23 02:52:00 UTC (rev 38021)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.ui.bot.tests.examples;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
@@ -18,6 +19,7 @@
protected void executeExample() {
super.executeExample();
String text = executeClientGetServerOutput("org.jboss.soa.esb.samples.quickstart.webserviceproducer.test.SendMessage","jms");
+ SWTTestExt.servers.removeAllProjectsFromServer();
assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Goodbye!!"));
fail("testing method http not yet implemented");
12 years, 9 months
- 1
- 0
JBoss Tools SVN: r38020 - in trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage: internal/preferences and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-01-22 13:05:50 -0500 (Sun, 22 Jan 2012)
New Revision: 38020
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/JBossToolsEclipseEnvironment.java
Log:
JBIDE-10653 detect who have central enabled
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2012-01-22 17:32:08 UTC (rev 38019)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2012-01-22 18:05:50 UTC (rev 38020)
@@ -70,6 +70,8 @@
// appendParameter(IGoogleAnalyticsParameters.PARAM_HID,
// getRandomNumber(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_FLASH_VERSION, googleParameters.getFlashVersion(), builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_EVENT_TRACKING, googleParameters.getCentralEnabled(), builder);
+
appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, googleParameters.getReferral(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getURI(), builder);
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2012-01-22 17:32:08 UTC (rev 38019)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2012-01-22 18:05:50 UTC (rev 38020)
@@ -33,6 +33,7 @@
public static final String PARAM_PAGE_REQUEST = "utmp";
public static final String PARAM_ACCOUNT_NAME = "utmac";
public static final String PARAM_HOST_NAME = "utmhn";
+ public static final String PARAM_EVENT_TRACKING = "utme";
public static final String PARAM_COOKIES = "utmcc";
public static final String PARAM_COOKIES_UNIQUE_VISITOR_ID = "__utma";
public static final String PARAM_COOKIES_SESSION = "__utmb";
@@ -110,4 +111,8 @@
* @return a user defined value
*/
public String getUserDefined();
+
+ public String getCentralEnabled();
+
+ public String getCentralEnabledValue();
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java 2012-01-22 17:32:08 UTC (rev 38019)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java 2012-01-22 18:05:50 UTC (rev 38020)
@@ -32,7 +32,8 @@
public static String UsageReportPreferencePage_ScreenColors;
public static String UsageReportPreferencePage_ScreenResolution;
public static String UsageReportPreferencePage_Error_Saving;
-
+ public static String UsageReportPreferencePage_JBossCentralEnabled;
+
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, PreferencesMessages.class);
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java 2012-01-22 17:32:08 UTC (rev 38019)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java 2012-01-22 18:05:50 UTC (rev 38020)
@@ -127,6 +127,9 @@
appendLabeledValue(PreferencesMessages.UsageReportPreferencePage_CurrentUsageHit,
getFormattedDate(eclipseEnvironment.getCurrentVisit()), builder,
styles);
+ appendLabeledValue(PreferencesMessages.UsageReportPreferencePage_JBossCentralEnabled,
+ eclipseEnvironment.getCentralEnabledValue(), builder,
+ styles);
text.setText(builder.toString());
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties 2012-01-22 17:32:08 UTC (rev 38019)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties 2012-01-22 18:05:50 UTC (rev 38020)
@@ -5,6 +5,7 @@
UsageReportPreferencePage_JBossToolsVersion=Version\:
UsageReportPreferencePage_LastUsageHit=Last usage reported on\:
UsageReportPreferencePage_Locale=Locale\:
+UsageReportPreferencePage_JBossCentralEnabled=JBoss Central Enabled\:
UsageReportPreferencePage_NumberOfUsageHits=Number of usage-hits\:
UsageReportPreferencePage_OperatingSystem=Operating system\:
UsageReportPreferencePage_OperatingSystemVersion=Operating system version\:
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/JBossToolsEclipseEnvironment.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/JBossToolsEclipseEnvironment.java 2012-01-22 17:32:08 UTC (rev 38019)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/JBossToolsEclipseEnvironment.java 2012-01-22 18:05:50 UTC (rev 38020)
@@ -15,16 +15,25 @@
import org.eclipse.core.runtime.IBundleGroupProvider;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
import org.jboss.tools.usage.googleanalytics.IJBossToolsEclipseEnvironment;
import org.jboss.tools.usage.googleanalytics.eclipse.AbstractEclipseEnvironment;
import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
+import org.osgi.framework.Bundle;
/**
* @author Andre Dietisheim
*/
public class JBossToolsEclipseEnvironment extends AbstractEclipseEnvironment implements IJBossToolsEclipseEnvironment {
+ private static final String CLOSED_BRACKET = ")"; //$NON-NLS-1$
+ private static final String TRUE = "true";
+ private static final String FALSE = "false";
private static final char JBOSS_COMPONENTS_DELIMITER = '-';
+ private static final String JBOSS_CENTRAL_PLUGIN_ID = "org.jboss.tools.central"; //$NON-NLS-1$
+ private static final String SHOW_JBOSS_CENTRAL_ON_STARTUP = "showJBossCentralOnStartup"; //$NON-NLS-1$
+ private static final boolean SHOW_JBOSS_CENTRAL_ON_STARTUP_DEFAULT_VALUE = true;
+ private static final String JBOSS_CENTRAL_PARAMETER = "5(central*showOnStartup*"; //$NON-NLS-1$
public JBossToolsEclipseEnvironment(String accountName, String hostName, IEclipsePreferences preferences) {
super(accountName, hostName, preferences);
@@ -57,4 +66,22 @@
public boolean isLinuxDistro() {
return getLinuxDistroNameAndVersion() != null;
}
+
+ public String getCentralEnabled() {
+ return JBOSS_CENTRAL_PARAMETER + getCentralEnabledValue() + CLOSED_BRACKET;
+ }
+
+ public String getCentralEnabledValue() {
+ Bundle bundle = Platform.getBundle(JBOSS_CENTRAL_PLUGIN_ID);
+ if (bundle == null) {
+ return FALSE;
+ }
+ IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(JBOSS_CENTRAL_PLUGIN_ID);
+ boolean showOnStartup = prefs.getBoolean(SHOW_JBOSS_CENTRAL_ON_STARTUP,
+ SHOW_JBOSS_CENTRAL_ON_STARTUP_DEFAULT_VALUE);
+ if (showOnStartup) {
+ return TRUE;
+ }
+ return FALSE;
+ }
}
12 years, 9 months
- 1
- 0
JBoss Tools SVN: r38019 - trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-01-22 12:32:08 -0500 (Sun, 22 Jan 2012)
New Revision: 38019
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
Log:
JBIDE-10677 : If Seam Facet version is unavailable, don't bail but fallback to latest version instead.
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2012-01-22 13:12:35 UTC (rev 38018)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2012-01-22 17:32:08 UTC (rev 38019)
@@ -280,9 +280,16 @@
}
}
- private IProjectFacetVersion getSeamFacetVersion(String seamVersion) {
+ private IProjectFacetVersion getSeamFacetVersion(String seamVersion) throws CoreException {
String version = seamVersion.substring(0, 3);
- return seamFacet.getVersion(version);
+ IProjectFacetVersion facetVersion = null;
+ try {
+ facetVersion = seamFacet.getVersion(version);
+ } catch (Exception e) {
+ MavenSeamActivator.log(e, "Seam version "+ version+ " is not supported, using latest supported facet version instead");
+ facetVersion = seamFacet.getLatestVersion();
+ }
+ return facetVersion;
}
private void installEarFacets(IFacetedProject fproj,IProgressMonitor monitor) throws CoreException {
12 years, 9 months
- 1
- 0
JBoss Tools SVN: r38018 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: publishers/patterns and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-01-22 08:12:35 -0500 (Sun, 22 Jan 2012)
New Revision: 38018
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/ModuleDirectoryScannerPathFilter.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/PublishFilterDirectoryScanner.java
Log:
JBIDE-10642 : fixed platform dependent path comparisons that didn't work on Windows. Also don't scan anything if no patterns are set.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2012-01-22 11:57:42 UTC (rev 38017)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2012-01-22 13:12:35 UTC (rev 38018)
@@ -144,16 +144,21 @@
if( ServerModelUtilities.isBinaryModule(module) )
return null;
String[] incExc = getProjectIncludesExcludes(module);
- if( incExc != null ) {
- try {
- ModuleDirectoryScannerPathFilter filter =
- new ModuleDirectoryScannerPathFilter(getMembers(module),
- incExc[0], incExc[1]);
- return filter;
- } catch( CoreException ce ) {
- JBossServerCorePlugin.getDefault().getLog().log(ce.getStatus());
- }
+ String inclusionPatterns = incExc[0];
+ String exclusionPatterns = incExc[1];
+ if (exclusionPatterns == null
+ && (inclusionPatterns == null || ALL_RESOURCES_PATTERN.equals(inclusionPatterns))) {
+ //No filtering necessary, everything is included. That way we avoid unnecessary scans
+ return null;
}
+ try {
+ ModuleDirectoryScannerPathFilter filter =
+ new ModuleDirectoryScannerPathFilter(getMembers(module),
+ inclusionPatterns, exclusionPatterns);
+ return filter;
+ } catch( CoreException ce ) {
+ JBossServerCorePlugin.getDefault().getLog().log(ce.getStatus());
+ }
return null;
}
@@ -172,6 +177,7 @@
*/
public static final String COMPONENT_EXCLUSIONS_PATTERN = "component.exclusion.patterns"; //$NON-NLS-1$
+ private static final String ALL_RESOURCES_PATTERN = "**"; //$NON-NLS-1$
/**
* Does this project have the proper settings that call for
* include and exclude patterns in the virtual component metadata?
@@ -186,9 +192,26 @@
IProject p = module.getProject();
IVirtualComponent vc = ComponentCore.createComponent(p);
Properties props = vc.getMetaProperties();
+ String exclusionPatterns = getPatternValue(props, COMPONENT_EXCLUSIONS_PATTERN);
+ String inclusionPatterns = getPatternValue(props, COMPONENT_INCLUSIONS_PATTERN);
+
return new String[]{
- (String) props.get(COMPONENT_INCLUSIONS_PATTERN),
- (String) props.get(COMPONENT_EXCLUSIONS_PATTERN)
+ inclusionPatterns,
+ exclusionPatterns
};
}
+
+ /**
+ * Returns the trimmed property value if it exists and is not empty, or null otherwise
+ */
+ private static String getPatternValue(Properties props, String propertyName) {
+ String value = props.getProperty(propertyName);
+ if (value != null) {
+ value = value.trim();
+ if (value.length() == 0) {
+ value = null;
+ }
+ }
+ return value;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/ModuleDirectoryScannerPathFilter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/ModuleDirectoryScannerPathFilter.java 2012-01-22 11:57:42 UTC (rev 38017)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/ModuleDirectoryScannerPathFilter.java 2012-01-22 13:12:35 UTC (rev 38018)
@@ -17,15 +17,10 @@
*/
public class ModuleDirectoryScannerPathFilter implements IModulePathFilter {
- private IModuleResource[] members;
- private String includes, excludes;
private PublishFilterDirectoryScanner scanner;
private boolean scanned = false;
public ModuleDirectoryScannerPathFilter(IModuleResource[] members,
String includes, String excludes) {
- this.members = members;
- this.includes = includes;
- this.excludes = excludes;
scanner = new PublishFilterDirectoryScanner(members);
scanner.setIncludes(includes);
scanner.setExcludes(excludes);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/PublishFilterDirectoryScanner.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/PublishFilterDirectoryScanner.java 2012-01-22 11:57:42 UTC (rev 38017)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/PublishFilterDirectoryScanner.java 2012-01-22 13:12:35 UTC (rev 38018)
@@ -886,12 +886,16 @@
: al.toArray(new String[al.size()]);
}
+ /**
+ * Returns the platform-dependent resource path.
+ */
+ private String getResourcePath(IModuleResource resource) {
+ return resource.getModuleRelativePath().append(resource.getName()).makeRelative().toOSString();
+ }
+
/*
* Public accessors
*/
- private String getResourcePath(IModuleResource resource) {
- return resource.getModuleRelativePath().append(resource.getName()).makeRelative().toString();
- }
public boolean isIncludedFile(IModuleFile resource) {
return isIncludedFile(getResourcePath(resource));
}
@@ -902,13 +906,15 @@
return isNotIncludedButRequired(getResourcePath(resource));
}
public boolean isIncludedMember(IModuleResource resource) {
- return isIncludedFile(getResourcePath(resource))
- || isIncludedDir(getResourcePath(resource));
+ String path = getResourcePath(resource);
+ return isIncludedFile(path)
+ || isIncludedDir(path);
}
public boolean isRequiredMember(IModuleResource resource) {
- return isIncludedFile(getResourcePath(resource))
- || isIncludedDir(getResourcePath(resource))
- || isNotIncludedButRequired(getResourcePath(resource));
+ String path = getResourcePath(resource);
+ return isIncludedFile(path)
+ || isIncludedDir(path)
+ || isNotIncludedButRequired(path);
}
public boolean isIncludedFile(String vpath) {
return filesIncluded.contains(vpath);
12 years, 9 months
- 1
- 0
JBoss Tools SVN: r38017 - in trunk/forge/plugins: org.jboss.tools.forge.ui and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-01-22 06:57:42 -0500 (Sun, 22 Jan 2012)
New Revision: 38017
Added:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeStartupPreferencePage.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/startup/
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/startup/ForgeStarter.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java
trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/dialog/ForgeCommandListDialog.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/SelectionSynchronizer.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationsPreferencePage.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java
Log:
JBIDE-10272: Automatically Start Forge When Eclipse Starts
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -35,6 +35,7 @@
public class ForgeRuntimesPreferences {
static final String PREF_FORGE_RUNTIMES = "org.jboss.tools.forge.core.runtimes";
+ static final String PREF_FORGE_STARTUP = "org.jboss.tools.forge.core.startup";
public static final ForgeRuntimesPreferences INSTANCE = new ForgeRuntimesPreferences();
@@ -50,13 +51,18 @@
return (ForgeRuntime[])runtimes.toArray(new ForgeRuntime[runtimes.size()]);
}
- public ForgeRuntime getDefault() {
+ public ForgeRuntime getDefaultRuntime() {
if (defaultRuntime == null) {
initializeRuntimes();
}
return defaultRuntime;
}
+ public boolean getStartup() {
+ return getForgeCorePreferences().getBoolean(PREF_FORGE_STARTUP, false);
+
+ }
+
private IEclipsePreferences getForgeCorePreferences() {
return InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
}
@@ -143,6 +149,16 @@
saveRuntimes();
}
+ public void setStartup(boolean startup) {
+ try {
+ IEclipsePreferences eclipsePreferences = getForgeCorePreferences();
+ eclipsePreferences.putBoolean(PREF_FORGE_STARTUP, startup);
+ eclipsePreferences.flush();
+ } catch (BackingStoreException e) {
+ ForgeCorePlugin.log(e);
+ }
+ }
+
private void saveRuntimes() {
try {
IEclipsePreferences eclipsePreferences = getForgeCorePreferences();
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2012-01-22 11:57:42 UTC (rev 38017)
@@ -19,7 +19,7 @@
<extension point="org.eclipse.ui.preferencePages">
<page
name="Forge"
- class="org.jboss.tools.forge.ui.preferences.ForgeEmptyPreferencePage"
+ class="org.jboss.tools.forge.ui.preferences.ForgeStartupPreferencePage"
id="org.jboss.tools.forge">
</page>
<page
@@ -185,4 +185,10 @@
</variable>
</sourceProvider>
</extension>
+ <extension
+ point="org.eclipse.ui.startup">
+ <startup
+ class="org.jboss.tools.forge.ui.startup.ForgeStarter">
+ </startup>
+ </extension>
</plugin>
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -5,7 +5,6 @@
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -14,6 +13,7 @@
import org.jboss.tools.forge.ui.ForgeUIPlugin;
import org.jboss.tools.forge.ui.dialog.ForgeCommandListDialog;
import org.jboss.tools.forge.ui.part.ForgeView;
+import org.jboss.tools.forge.ui.util.ForgeHelper;
public class ForgeCommandListHandler extends AbstractHandler {
@@ -22,31 +22,24 @@
if (window == null) {
return null;
}
- ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault();
- if (isStarting(runtime)) {
+ showForgeView(window);
+ ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
+ if (ForgeHelper.isForgeStarting()) {
showWaitUntilStartedMessage();
- } else if (!(isRunning(runtime))) {
- askUserToStartRuntime(window);
+ } else if (!ForgeHelper.isForgeRunning()) {
+ askUserToStartRuntime();
}
if (runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) {
new ForgeCommandListDialog(window, runtime).open();
}
- return null;
+ return null;
}
- private boolean isStarting(ForgeRuntime runtime) {
- return runtime != null && ForgeRuntime.STATE_STARTING.equals(runtime.getState());
- }
-
- private boolean isRunning(ForgeRuntime runtime) {
- return runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState());
- }
-
private void showWaitUntilStartedMessage() {
MessageDialog.openInformation(null, "Forge Starting", "Forge is starting. Please wait until the Forge runtime is started");
}
- private void askUserToStartRuntime(final IWorkbenchWindow window) {
+ private void askUserToStartRuntime() {
boolean start = MessageDialog.open(
MessageDialog.QUESTION,
null,
@@ -57,17 +50,18 @@
Display.getCurrent().asyncExec(new Runnable() {
@Override
public void run() {
- try {
- IViewPart part = window.getActivePage().showView(ForgeView.ID);
- if (part != null && part instanceof ForgeView) {
- ((ForgeView)part).startForge();
- }
- } catch (PartInitException e) {
- ForgeUIPlugin.log(e);
- }
+ ForgeHelper.startForge();
}
});
}
}
+
+ private void showForgeView(IWorkbenchWindow window) {
+ try {
+ window.getActivePage().showView(ForgeView.ID);
+ } catch (PartInitException e) {
+ ForgeUIPlugin.log(e);
+ }
+ }
}
\ No newline at end of file
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -10,7 +10,7 @@
public Object execute(ExecutionEvent executionEvent) {
ForgeView forgeView = ForgeHelper.getForgeView();
if (forgeView != null) {
- forgeView.startForge();
+ ForgeHelper.startForge();
}
return null;
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -2,16 +2,12 @@
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
-import org.jboss.tools.forge.ui.part.ForgeView;
import org.jboss.tools.forge.ui.util.ForgeHelper;
public class StopHandler extends AbstractHandler {
public Object execute(ExecutionEvent executionEvent) {
- ForgeView forgeView = ForgeHelper.getForgeView();
- if (forgeView != null) {
- forgeView.stopForge();
- }
+ ForgeHelper.stopForge();
return null;
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -7,9 +7,9 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.forge.ui.ForgeUIPlugin;
import org.jboss.tools.forge.ui.part.ForgeView;
@@ -81,13 +81,17 @@
}
private void showForgeConsole() {
- try {
+// try {
IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
- workbenchPage.showView(ForgeView.ID).setFocus();
- } catch (PartInitException e) {
- ForgeUIPlugin.log(e);
- }
+ IViewPart forgeView = workbenchPage.findView(ForgeView.ID);
+ if (forgeView != null) {
+ forgeView.setFocus();
+ }
+// workbenchPage.showView(ForgeView.ID).setFocus();
+// } catch (PartInitException e) {
+// ForgeUIPlugin.log(e);
+// }
}
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -129,7 +129,7 @@
}
private ForgeRuntime getRuntime() {
- return ForgeRuntimesPreferences.INSTANCE.getDefault();
+ return ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
}
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -69,7 +69,7 @@
private void resetRuntime() {
ForgeView forgeView = ForgeHelper.getForgeView();
if (forgeView != null) {
- ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault();
+ ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
if (runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) {
runtime.sendInput("reset\n");
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/dialog/ForgeCommandListDialog.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/dialog/ForgeCommandListDialog.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/dialog/ForgeCommandListDialog.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -191,5 +191,5 @@
protected Control getFocusControl() {
return filterText;
}
-
+
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -4,10 +4,6 @@
import java.beans.PropertyChangeListener;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -33,7 +29,7 @@
import org.jboss.tools.forge.ui.ForgeUIPlugin;
import org.jboss.tools.forge.ui.commands.SourceProvider;
import org.jboss.tools.forge.ui.console.ForgeTextViewer;
-import org.jboss.tools.forge.ui.document.ForgeDocument;
+import org.jboss.tools.forge.ui.util.ForgeHelper;
public class ForgeView extends ViewPart implements PropertyChangeListener, IShowInTarget {
@@ -67,6 +63,12 @@
private ISelection selection;
private SelectionSynchronizer synchronizer;
+ private ISelectionListener selectionListener = new ISelectionListener() {
+ @Override
+ public void selectionChanged(IWorkbenchPart part, ISelection newSelection) {
+ selection = newSelection;
+ }
+ };
@Override
public void createPartControl(Composite parent) {
@@ -74,13 +76,12 @@
pageBook = new PageBook(parent, SWT.NONE);
createRunningPage();
createNotRunningPage();
- showPage(notRunning);
- getSite().getWorkbenchWindow().getSelectionService().addSelectionListener(new ISelectionListener() {
- @Override
- public void selectionChanged(IWorkbenchPart part, ISelection newSelection) {
- selection = newSelection;
- }
- });
+ getSite().getWorkbenchWindow().getSelectionService().addSelectionListener(selectionListener);
+ ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
+ if (runtime != null) {
+ updatePages(runtime.getState());
+ runtime.addPropertyChangeListener(this);
+ }
}
public ISelection getSelection() {
@@ -116,22 +117,52 @@
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (ForgeRuntime.PROPERTY_STATE.equals(evt.getPropertyName())) {
- if (ForgeRuntime.STATE_STARTING.equals(evt.getNewValue())) {
- handleStateStarting();
- } else if (ForgeRuntime.STATE_RUNNING.equals(evt.getNewValue())) {
- handleStateRunning();
- } else if (ForgeRuntime.STATE_NOT_RUNNING.equals(evt.getNewValue())) {
- handleStateNotRunning();
- }
+ updatePages(evt.getNewValue());
}
}
+ public void dispose() {
+ ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
+ if (runtime != null) {
+ runtime.removePropertyChangeListener(this);
+ }
+ getSite().getWorkbenchWindow().getSelectionService().removeSelectionListener(selectionListener);
+ runningPage.dispose();
+ notRunningPage.dispose();
+ pageBook.dispose();
+ super.dispose();
+ }
+
+ private void updatePages(Object state) {
+ if (ForgeRuntime.STATE_STARTING.equals(state)) {
+ handleStateStarting();
+ } else if (ForgeRuntime.STATE_RUNNING.equals(state)) {
+ handleStateRunning();
+ } else if (ForgeRuntime.STATE_NOT_RUNNING.equals(state)) {
+ handleStateNotRunning();
+ }
+ }
+
private void handleStateStarting() {
getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
notRunningMessage = STARTING_MESSAGE;
notRunningPage.setMessage(notRunningMessage);
+ Thread waitThread = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ while (!ForgeHelper.isForgeRunning()) {
+ try {
+ Thread.sleep(1000);
+ updateNonRunningPage();
+ } catch (InterruptedException e) {
+ ForgeUIPlugin.log(e);
+ }
+ }
+ }
+ });
+ waitThread.start();
}
});
}
@@ -147,10 +178,6 @@
}
private void handleStateNotRunning() {
- ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault();
- if (runtime != null) {
- runtime.removePropertyChangeListener(this);
- }
getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
@@ -183,50 +210,6 @@
}
}
-// private void createRunningPage() {
-// Control oldForgeIsRunning = running;
-// Page oldForgeIsRunningPage = runningPage;
-// runningPage = new ForgePage(runtime);
-// runningPage.createControl(pageBook);
-// runningPage.init(new PageSite(getViewSite()));
-// running = runningPage.getControl();
-// if (oldForgeIsRunningPage != null) {
-// oldForgeIsRunningPage.dispose();
-// }
-// if (oldForgeIsRunning != null) {
-// oldForgeIsRunning.dispose();
-// }
-// }
-
- public void startForge() {
- final ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault();
- if (ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) return;
- ForgeDocument.INSTANCE.connect(runtime);
- runtime.addPropertyChangeListener(this);
- Job job = new Job("Starting Forge") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- runtime.start(monitor);
- return Status.OK_STATUS;
- }
- };
- job.schedule();
- Thread waitThread = new Thread(new Runnable() {
- @Override
- public void run() {
- while (runtime != null && !ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) {
- try {
- Thread.sleep(1000);
- updateNonRunningPage();
- } catch (InterruptedException e) {
- ForgeUIPlugin.log(e);
- }
- }
- }
- });
- waitThread.start();
- }
-
private void updateNonRunningPage() {
getDisplay().asyncExec(new Runnable() {
@Override
@@ -237,12 +220,6 @@
});
}
- public void stopForge() {
- IProgressMonitor progressMonitor = getViewSite().getActionBars().getStatusLineManager().getProgressMonitor();
- ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault();
- runtime.stop(progressMonitor);
- }
-
private Display getDisplay() {
return getSite().getShell().getDisplay();
}
@@ -251,8 +228,7 @@
if (context == null) {
return false;
}
- ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault();
- if (runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) {
+ if (ForgeHelper.isForgeRunning()) {
return goToSelection(context.getSelection());
} else {
return startForgeIsOK(context);
@@ -267,12 +243,11 @@
"Forge is not running. Do you want to start the Forge runtime?",
SWT.NONE);
if (start) {
- startForge();
+ ForgeHelper.startForge();
Thread waitThread = new Thread(new Runnable() {
@Override
public void run() {
- ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault();
- while (runtime != null && !ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) {
+ while (!ForgeHelper.isForgeRunning()) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
@@ -315,7 +290,7 @@
if (str.indexOf(' ') != -1) {
str = '\"' + str + '\"';
}
- ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault();
+ ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
runtime.sendInput("pick-up " + str + "\n");
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/SelectionSynchronizer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/SelectionSynchronizer.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/SelectionSynchronizer.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -43,7 +43,7 @@
if (path.indexOf(' ') != -1) {
path = '\"' + path + '\"';
}
- ForgeRuntime forgeRuntime = ForgeRuntimesPreferences.INSTANCE.getDefault();
+ ForgeRuntime forgeRuntime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
if (forgeRuntime != null && ForgeRuntime.STATE_RUNNING.equals(forgeRuntime.getState())) {
forgeRuntime.sendInput("pick-up " + path + "\n");
}
@@ -84,7 +84,7 @@
if (path.indexOf(' ') != -1) {
path = '\"' + path + '\"';
}
- ForgeRuntime forgeRuntime = ForgeRuntimesPreferences.INSTANCE.getDefault();
+ ForgeRuntime forgeRuntime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
if (forgeRuntime != null && ForgeRuntime.STATE_RUNNING.equals(forgeRuntime.getState())) {
forgeRuntime.sendInput("pick-up " + path + "\n");
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationsPreferencePage.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationsPreferencePage.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeInstallationsPreferencePage.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -245,7 +245,7 @@
} else if (runtime instanceof ForgeExternalRuntime) {
copy = new ForgeExternalRuntime(runtime.getName(), runtime.getLocation());
}
- if (runtime == ForgeRuntimesPreferences.INSTANCE.getDefault()) {
+ if (runtime == ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime()) {
defaultRuntime = copy;
}
runtimes.add(copy);
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeStartupPreferencePage.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeStartupPreferencePage.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeStartupPreferencePage.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -0,0 +1,49 @@
+package org.jboss.tools.forge.ui.preferences;
+
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences;
+
+public class ForgeStartupPreferencePage extends PreferencePage implements
+ IWorkbenchPreferencePage {
+
+ private Button startupButton;
+
+ protected Control createContents(Composite parent) {
+ noDefaultAndApplyButton();
+ Composite clientArea = createClientArea(parent);
+ createStartupButton(clientArea);
+ return null;
+ }
+
+ private void createStartupButton(Composite parent) {
+ startupButton = new Button(parent, SWT.CHECK);
+ startupButton.setText("Start Forge when Eclipse starts." );
+ startupButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ startupButton.setSelection(ForgeRuntimesPreferences.INSTANCE.getStartup());
+ }
+
+ private Composite createClientArea(Composite parent) {
+ Composite clientArea = new Composite(parent, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ clientArea.setLayout(layout);
+ GridData gridData = new GridData(GridData.FILL_BOTH);
+ clientArea.setLayoutData(gridData);
+ return clientArea;
+ }
+
+ public void init(IWorkbench workbench) {}
+
+ public boolean performOk() {
+ ForgeRuntimesPreferences.INSTANCE.setStartup(startupButton.getSelection());
+ return true;
+ }
+}
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeStartupPreferencePage.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/startup/ForgeStarter.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/startup/ForgeStarter.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/startup/ForgeStarter.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -0,0 +1,18 @@
+package org.jboss.tools.forge.ui.startup;
+
+import org.eclipse.ui.IStartup;
+import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences;
+import org.jboss.tools.forge.ui.util.ForgeHelper;
+
+public class ForgeStarter implements IStartup {
+
+ @Override
+ public void earlyStartup() {
+ if (ForgeRuntimesPreferences.INSTANCE.getStartup()) {
+ ForgeHelper.startForge();
+ }
+ }
+
+
+
+}
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/startup/ForgeStarter.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java 2012-01-21 22:05:19 UTC (rev 38016)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java 2012-01-22 11:57:42 UTC (rev 38017)
@@ -1,10 +1,17 @@
package org.jboss.tools.forge.ui.util;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences;
+import org.jboss.tools.forge.core.process.ForgeRuntime;
+import org.jboss.tools.forge.ui.document.ForgeDocument;
import org.jboss.tools.forge.ui.part.ForgeView;
public class ForgeHelper {
@@ -24,4 +31,41 @@
}
}
+ public static void startForge() {
+ final ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
+ if (runtime == null || ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) return;
+ ForgeDocument.INSTANCE.connect(runtime);
+ Job job = new Job("Starting Forge") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ runtime.start(monitor);
+ return Status.OK_STATUS;
+ }
+ };
+ job.schedule();
+ }
+
+ public static void stopForge() {
+ final ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
+ if (runtime == null || ForgeRuntime.STATE_NOT_RUNNING.equals(runtime.getState())) return;
+ Job job = new Job("Stopping Forge") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ runtime.stop(monitor);
+ return Status.OK_STATUS;
+ }
+ };
+ job.schedule();
+ }
+
+ public static boolean isForgeRunning() {
+ ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
+ return runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState());
+ }
+
+ public static boolean isForgeStarting() {
+ ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
+ return runtime != null && ForgeRuntime.STATE_STARTING.equals(runtime.getState());
+ }
+
}
12 years, 9 months
- 1
- 0
JBoss Tools SVN: r38016 - trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-01-21 17:05:19 -0500 (Sat, 21 Jan 2012)
New Revision: 38016
Modified:
trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java
Log:
JBIDE-10684 JBoss Central tests fail
Modified: trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java 2012-01-21 02:01:19 UTC (rev 38015)
+++ trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java 2012-01-21 22:05:19 UTC (rev 38016)
@@ -19,7 +19,6 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorReference;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
@@ -33,7 +32,8 @@
import org.jboss.tools.central.jobs.RefreshNewsJob;
import org.jboss.tools.central.jobs.RefreshTutorialsJob;
import org.jboss.tools.central.model.FeedsEntry;
-import org.jboss.tools.central.model.TutorialCategory;
+import org.jboss.tools.project.examples.model.Category;
+import org.jboss.tools.project.examples.model.Project;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.xpl.EditorTestHelper;
import org.junit.AfterClass;
@@ -77,7 +77,7 @@
public void testTutorials() throws Exception {
Job.getJobManager().join(JBossCentralActivator.JBOSS_CENTRAL_FAMILY,
new NullProgressMonitor());
- Map<String, TutorialCategory> categories = RefreshTutorialsJob.INSTANCE
+ Map<Category, List<Project>> categories = RefreshTutorialsJob.INSTANCE
.getTutorialCategories();
assertTrue("No one tutorial is found", categories.size() > 0);
}
12 years, 9 months
- 1
- 0
JBoss Tools SVN: r38015 - trunk/tests/features/org.jboss.tools.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-20 21:01:19 -0500 (Fri, 20 Jan 2012)
New Revision: 38015
Added:
trunk/tests/features/org.jboss.tools.test.feature/feature.properties
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
Log:
JBIDE-8997 CLONE - 2010 in the copyright headers should be replaced by 2011
externalized stings for tests feature
Added: trunk/tests/features/org.jboss.tools.test.feature/feature.properties
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.properties (rev 0)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.properties 2012-01-21 02:01:19 UTC (rev 38015)
@@ -0,0 +1,55 @@
+###############################################################################
+# Copyright (c) 2008-2011 Red Hat, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools Test Framework
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBoss Tools Test Update Site
+discoverySiteName=JBossTools Test Development Update Site
+
+# "description" property - description of the feature
+description=Test Tools provide basic support for tests
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=Copyright (c) 2007-2011 Exadel, Inc and Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ############### end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
+Raleigh NC 27606 USA.
+# END NON-TRANSLATABLE
+########### end of license property ##########################################
Property changes on: trunk/tests/features/org.jboss.tools.test.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2012-01-21 01:54:22 UTC (rev 38014)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2012-01-21 02:01:19 UTC (rev 38015)
@@ -1,31 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.test.feature" label="JBoss Tools - Tests - Tests Framework" version="3.2.0.qualifier">
+<feature
+ id="org.jboss.tools.test.feature"
+ label="%featureName"
+ version="3.2.0.qualifier"
+ provider-name="%providerName">
- <description url="http://www.jboss.org/tools">
- JBoss Tools - Tests - Tests Framework
+ <description url="http://www.jboss.org/tools">
+ %description
</description>
- <copyright>
- Copyright (c) 2007-2012 Exadel, Inc and Red Hat, Inc.
-Distributed under license by Red Hat, Inc. All rights reserved.
-This program is made available under the terms of the
-Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
-Contributors:
-Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ <copyright>
+ %copyright
</copyright>
- <license>
- Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
+ <license url="%licenseURL">
+ %license
</license>
- <plugin id="org.jboss.tools.tests" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.ui.bot.ext" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.ui.bot.ext.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin
+ id="org.jboss.tools.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.ui.bot.ext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.ui.bot.ext.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
12 years, 9 months
- 1
- 0