JBoss Tools SVN: r41659 - branches/jbosstools-3.3.x/xulrunner/features/org.mozilla.xulrunner.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-06-03 00:28:00 -0400 (Sun, 03 Jun 2012)
New Revision: 41659
Modified:
branches/jbosstools-3.3.x/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
Log:
fixed architecture attribute for xulrunner feature to allow tycho resolve macosx xulrunner plugin for all configurations we needed (merge from trunk to fix continuous build)
Modified: branches/jbosstools-3.3.x/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2012-06-03 03:04:17 UTC (rev 41658)
+++ branches/jbosstools-3.3.x/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2012-06-03 04:28:00 UTC (rev 41659)
@@ -24,7 +24,6 @@
id="org.mozilla.xpcom"
download-size="0"
install-size="0"
- unpack="true"
version="0.0.0"/>
<plugin
@@ -34,7 +33,6 @@
arch="x86"
download-size="0"
install-size="0"
- unpack="true"
version="0.0.0"/>
<plugin
@@ -44,7 +42,6 @@
arch="x86_64"
download-size="0"
install-size="0"
- unpack="true"
version="0.0.0"/>
<plugin
@@ -54,16 +51,15 @@
arch="x86"
download-size="0"
install-size="0"
- unpack="true"
version="0.0.0"/>
<plugin
id="org.mozilla.xulrunner.cocoa.macosx"
os="macosx"
ws="cocoa"
+ arch="x86"
download-size="0"
install-size="0"
- unpack="true"
version="0.0.0"/>
</feature>
12 years, 7 months
JBoss Tools SVN: r41658 - branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/action.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-06-02 23:04:17 -0400 (Sat, 02 Jun 2012)
New Revision: 41658
Modified:
branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/action/Notifier.java
Log:
The test for https://issues.jboss.org/browse/JBDS-2167 is still failing
Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/action/Notifier.java
===================================================================
--- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/action/Notifier.java 2012-06-02 14:34:26 UTC (rev 41657)
+++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/action/Notifier.java 2012-06-03 03:04:17 UTC (rev 41658)
@@ -103,14 +103,14 @@
/* Comment out due to - https://issues.jboss.org/browse/JBDS-2167 */
- bot.button("&Add...").click();
- SWTBotTreeItem [] theItems = bot.tree().getAllItems();
+// bot.button("&Add...").click();
+// SWTBotTreeItem [] theItems = bot.tree().getAllItems();
+//
+// theItems[0].getNode("resources.jar").expand();
+// theItems[0].getNode("resources.jar").getNode("META-INF").expand();
+// theItems[0].getNode("resources.jar").getNode("META-INF").getNode("MANIFEST.MF").select();
+// bot.button("&Finish").click();
- theItems[0].getNode("resources.jar").expand();
- theItems[0].getNode("resources.jar").getNode("META-INF").expand();
- theItems[0].getNode("resources.jar").getNode("META-INF").getNode("MANIFEST.MF").select();
- bot.button("&Finish").click();
-
editor.save();
}
12 years, 7 months
JBoss Tools SVN: r41657 - trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooling/3.3.0.Beta3.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-06-02 10:34:26 -0400 (Sat, 02 Jun 2012)
New Revision: 41657
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
Log:
Renamed jobs
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-06-02 11:48:32 UTC (rev 41656)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-06-02 14:34:26 UTC (rev 41657)
@@ -13,14 +13,14 @@
<!-- SOA Tooling : 10 x 1 = 10 -->
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--bpel/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--droolsjbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--esb/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--flow/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--jbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--modeshape/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--runtime-soa/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--teiid-designer/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--bpel/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--droolsjbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--esb/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--flow/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--jbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--modeshape/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--teiid-designer/all/repo/'/>
<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' />
<child location='../../../../staging/SwitchYard-Tools/eclipse/'/>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-06-02 11:48:32 UTC (rev 41656)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-06-02 14:34:26 UTC (rev 41657)
@@ -13,14 +13,14 @@
<!-- SOA Tooling : 10 x 1 = 10 -->
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--bpel/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--droolsjbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--esb/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--flow/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--jbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--modeshape/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--runtime-soa/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Beta3_Release.component--teiid-designer/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--bpel/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--droolsjbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--esb/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--flow/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--jbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--modeshape/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Beta3.component--teiid-designer/all/repo/'/>
<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' />
<child location='../../../../staging/SwitchYard-Tools/eclipse/'/>
12 years, 7 months
JBoss Tools SVN: r41655 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-06-02 07:39:48 -0400 (Sat, 02 Jun 2012)
New Revision: 41655
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-community-3...
trunk/download.jboss.org/jbosstools/examples/project-examples-jbds40.xml
Log:
JBIDE-11781 - webservice_producer/client quickstarts have build (path) errors on 3.3.0.beta1
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-community-3...
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-community-3... 2012-06-02 11:30:52 UTC (rev 41654)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-community-3... 2012-06-02 11:39:48 UTC (rev 41655)
@@ -625,7 +625,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
- <property name="eclipse-projects">helloworld_action</property>
+ <property name="eclipse-projects">helloworld_action,helloworld_action_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
</fix>
@@ -676,7 +676,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
- <property name="eclipse-projects">helloworld_file_action</property>
+ <property name="eclipse-projects">helloworld_file_action, helloworld_file_action_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
</fix>
@@ -721,7 +721,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
- <property name="eclipse-projects">webservice_producer</property>
+ <property name="eclipse-projects">webservice_producer, webservice_producer_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
</fix>
@@ -745,7 +745,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
- <property name="eclipse-projects">transform_CSV2XML</property>
+ <property name="eclipse-projects">transform_CSV2XML,transform_CSV2XML_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
</fix>
@@ -767,7 +767,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
- <property name="eclipse-projects">transform_XML2POJO</property>
+ <property name="eclipse-projects">transform_XML2POJO,transform_XML2POJO_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
</fix>
@@ -796,7 +796,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
- <property name="eclipse-projects">transform_XML2XML_date_manipulation</property>
+ <property name="eclipse-projects">transform_XML2XML_date_manipulation,transform_XML2XML_date_manipulation_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
</fix>
@@ -819,7 +819,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
- <property name="eclipse-projects">transform_XML2XML_simple</property>
+ <property name="eclipse-projects">transform_XML2XML_simple, transform_XML2XML_simple_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
</fix>
@@ -842,7 +842,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">helloworld</property>
+ <property name="eclipse-projects">helloworld, helloworld_testclient</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -864,7 +864,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">helloworld_action</property>
+ <property name="eclipse-projects">helloworld_action, helloworld_action_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -889,7 +889,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">helloworld_file_action</property>
+ <property name="eclipse-projects">helloworld_file_action, helloworld_file_action_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -936,7 +936,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">webservice_producer</property>
+ <property name="eclipse-projects">webservice_producer, webservice_producer_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -959,7 +959,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">transform_CSV2XML</property>
+ <property name="eclipse-projects">transform_CSV2XML,transform_CSV2XML_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -983,7 +983,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">transform_XML2POJO</property>
+ <property name="eclipse-projects">transform_XML2POJO,transform_XML2POJO_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -1014,7 +1014,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">transform_XML2XML_date_manipulation</property>
+ <property name="eclipse-projects">transform_XML2XML_date_manipulation,transform_XML2XML_date_manipulation_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -1038,7 +1038,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">transform_XML2XML_simple</property>
+ <property name="eclipse-projects">transform_XML2XML_simple, transform_XML2XML_simple_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-jbds40.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-jbds40.xml 2012-06-02 11:30:52 UTC (rev 41654)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-jbds40.xml 2012-06-02 11:39:48 UTC (rev 41655)
@@ -391,7 +391,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">helloworld</property>
+ <property name="eclipse-projects">helloworld,helloworld_testclient</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -413,7 +413,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">helloworld_action</property>
+ <property name="eclipse-projects">helloworld_action,helloworld_action_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -438,7 +438,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">helloworld_file_action</property>
+ <property name="eclipse-projects">helloworld_file_action,helloworld_file_action_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -485,7 +485,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">webservice_producer</property>
+ <property name="eclipse-projects">webservice_producer, webservice_producer_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -508,7 +508,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">transform_CSV2XML</property>
+ <property name="eclipse-projects">transform_CSV2XML,transform_CSV2XML_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -532,7 +532,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">transform_XML2POJO</property>
+ <property name="eclipse-projects">transform_XML2POJO,transform_XML2POJO_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -563,7 +563,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">transform_XML2XML_date_manipulation</property>
+ <property name="eclipse-projects">transform_XML2XML_date_manipulation,transform_XML2XML_date_manipulation_client</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
@@ -587,7 +587,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
- <property name="eclipse-projects">transform_XML2XML_simple</property>
+ <property name="eclipse-projects">transform_XML2XML_simple,transform_XML2XML_simple_client </property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
</fix>
12 years, 7 months
JBoss Tools SVN: r41654 - tags.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-06-02 07:30:52 -0400 (Sat, 02 Jun 2012)
New Revision: 41654
Added:
tags/soatools-3.3.0.Beta3/
Log:
Tagging for SOA tools Beta3 release
12 years, 7 months
JBoss Tools SVN: r41653 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui: src/org/jboss/tools/jst/web/ui/wizards/newfile and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-06-01 21:25:52 -0400 (Fri, 01 Jun 2012)
New Revision: 41653
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/persistence-xml-as7.xml
trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/persistence-xml-default.xml
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
Log:
JBIDE-11394
https://issues.jboss.org/browse/JBIDE-11394
Added 'Register in persistence.xml' checkbox, and initial implementation.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2012-06-02 00:03:13 UTC (rev 41652)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2012-06-02 01:25:52 UTC (rev 41653)
@@ -102,6 +102,7 @@
public static String NewDSXMLWizard_PROFILE_NOT_FOUND;
public static String NewDSXMLWizard_DRIVER_NOT_FOUND;
public static String NewDSXMLWizard_JAR_LIST_NOT_SET;
+ public static String NewDSXMLWizard_REGISTER_FILE_LABEL;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2012-06-02 00:03:13 UTC (rev 41652)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2012-06-02 01:25:52 UTC (rev 41653)
@@ -95,3 +95,4 @@
NewDSXMLWizard_JAR_LIST_NOT_SET=Jar list for the connection profile is not set.
NewDSXMLWizard_PARENT_FOLDER_LABEL=Parent fold&er:
NewDSXMLWizard_FILE_NAME_LABEL=File na&me:
+NewDSXMLWizard_REGISTER_FILE_LABEL=Register in persistence.xml
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-06-02 00:03:13 UTC (rev 41652)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-06-02 01:25:52 UTC (rev 41653)
@@ -33,6 +33,7 @@
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspace;
@@ -89,6 +90,7 @@
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.ui.IValidator;
import org.jboss.tools.common.ui.ValidatorFactory;
import org.jboss.tools.common.ui.widget.editor.ButtonFieldEditor;
@@ -203,8 +205,10 @@
private IFieldEditor folderEditor;
private String initialFileName = ""; //$NON-NLS-1$
private IFieldEditor fileNameEditor;
+ private IFieldEditor registerEditor;
IDataModel model;
+ FilterSetCollection viewFilterSetCollection;
public WizardNewDSXMLFileCreationPage(String pageName, IStructuredSelection selection) {
@@ -243,7 +247,7 @@
File dataSourceDsFile = new File(homePath, templatePath);
//2. Create filter set for Ant.
- FilterSetCollection viewFilterSetCollection = new FilterSetCollection();
+ viewFilterSetCollection = new FilterSetCollection();
// Do it by reusing data model provider.
model = DataModelFactory.createDataModel(new DSDataModelProvider());
@@ -373,6 +377,9 @@
}
});
+ registerEditor = IFieldEditorFactory.INSTANCE.createCheckboxEditor("register", Messages.NewDSXMLWizard_REGISTER_FILE_LABEL, true); //$NON-NLS-1$
+ registerEditor.doFillIntoGrid(q);
+
setControl(topLevel);
setPageComplete(validatePage());
}
@@ -515,8 +522,111 @@
return null;
}
newFile = newFileHandle;
+
+ if("true".equals(registerEditor.getValueAsString())) { //$NON-NLS-1$
+ final IFile persistenceFile = findPersistenceXMLHandle();
+ if(persistenceFile != null) {
+ final InputStream content = getPersistanceXMLContent(persistenceFile);
+
+ op = new IRunnableWithProgress() {
+ public void run(IProgressMonitor monitor) {
+ if(!persistenceFile.exists()) {
+ CreateFileOperation op = new CreateFileOperation(persistenceFile,
+ null, content, IDEWorkbenchMessages.WizardNewFileCreationPage_title);
+ try {
+ op.execute(monitor, WorkspaceUndoUtil.getUIInfoAdapter(getShell()));
+ } catch (final ExecutionException e) {
+ getContainer().getShell().getDisplay().syncExec(
+ new Runnable() {
+ public void run() {
+ if (e.getCause() instanceof CoreException) {
+ ErrorDialog.openError(getContainer().getShell(), // Was
+ // Utilities.getFocusShell()
+ IDEWorkbenchMessages.WizardNewFileCreationPage_errorTitle,
+ null, // no special
+ // message
+ ((CoreException) e.getCause()).getStatus());
+ } else {
+ IDEWorkbenchPlugin.log(getClass(), "createNewFile()", e.getCause()); //$NON-NLS-1$
+ MessageDialog.openError(getContainer().getShell(),
+ IDEWorkbenchMessages.WizardNewFileCreationPage_internalErrorTitle,
+ NLS.bind(IDEWorkbenchMessages.WizardNewFileCreationPage_internalErrorMessage,
+ e.getCause().getMessage()));
+ }
+ }
+ });
+ }
+ } else {
+ try {
+ persistenceFile.setContents(content, IResource.FORCE, monitor);
+ } catch (CoreException e) {
+ WebUiPlugin.getDefault().logError(e);
+ }
+ }
+ }
+ };
+ try {
+ getContainer().run(true, true, op);
+ } catch (InterruptedException e) {
+ return null;
+ } catch (InvocationTargetException e) {
+ // Execution Exceptions are handled above but we may still get
+ // unexpected runtime errors.
+ IDEWorkbenchPlugin.log(getClass(), "createNewFile()", e.getTargetException()); //$NON-NLS-1$
+ MessageDialog.open(MessageDialog.ERROR,
+ getContainer().getShell(),
+ IDEWorkbenchMessages.WizardNewFileCreationPage_internalErrorTitle,
+ NLS.bind(IDEWorkbenchMessages.WizardNewFileCreationPage_internalErrorMessage,
+ e.getTargetException().getMessage()), SWT.SHEET);
+ }
+ }
+ }
return newFile;
}
+
+ private IFile findPersistenceXMLHandle() {
+ IPath containerPath = getContainerFullPath();
+ IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(containerPath);
+ Set<IFolder> srcs = EclipseResourceUtil.getSourceFolders(folder.getProject());
+ IFolder src = (IFolder)EclipseResourceUtil.getJavaSourceRoot(folder.getProject());
+ if(src != null) {
+ IFile result = src.getFile("META-INF/persistence.xml"); //$NON-NLS-1$
+ if(!result.exists()) {
+ for (IFolder f: srcs) {
+ IFile r = f.getFile("META-INF/persistence.xml"); //$NON-NLS-1$
+ if(r.exists()) {
+ return r;
+ }
+ }
+ }
+ //handle to be created
+ return result;
+ }
+
+ return null;
+ }
+
+ private InputStream getPersistanceXMLContent(IFile persistenceFile) {
+ try {
+ File homePath = DSDataModelProvider.getTemplatesFolder();
+ String templatePath = (NewDSXMLWizardFactory.AS_7_TEMPLATE.equals(templateSelEditor.getValueAsString()))
+ ? "/Datasource/persistence-xml-as7.xml" //$NON-NLS-1$
+ : "/Datasource/persistence-xml-default.xml"; //$NON-NLS-1$
+ File persistenceFileTemplate = new File(homePath, templatePath);
+ StringResource sr = new StringResource();
+
+ ResourceUtils.copyResource(new FileResource(persistenceFileTemplate), sr, viewFilterSetCollection,
+ null, true, false, false, null, null, null, false);
+
+ // 4. Return input stream for new ds file taken from StringResource.
+ return sr.getInputStream();
+ } catch (IOException e) {
+ WebUiPlugin.getDefault().logError(e);
+ }
+
+ return null;
+ }
+
}
/**
Added: trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/persistence-xml-as7.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/persistence-xml-as7.xml (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/persistence-xml-as7.xml 2012-06-02 01:25:52 UTC (rev 41653)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.0"
+ xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ <persistence-unit name="primary">
+ <!-- If you are running in a production environment, add a managed
+ data source, this example data source is just for development and testing! -->
+ <!-- The datasource is deployed as ${ds-deployment-location}, you
+ can find it in the source at ${ds-source-location} -->
+ <jta-data-source>java:jboss/datasources/@datasourcename@</jta-data-source>
+ <properties>
+ <!-- Properties for Hibernate -->
+ <!--
+ <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+ -->
+ <!-- Print's out the SQL statement Hibernate is using to the console, useful for debugging -->
+ <property name="hibernate.show_sql" value="false" />
+ </properties>
+ </persistence-unit>
+</persistence>
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/persistence-xml-as7.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/persistence-xml-default.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/persistence-xml-default.xml (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/persistence-xml-default.xml 2012-06-02 01:25:52 UTC (rev 41653)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.0"
+ xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ <persistence-unit name="primary">
+ <!-- If you are running in a production environment, add a managed
+ data source, this example data source is just for development and testing! -->
+ <!-- The datasource is deployed as ${ds-deployment-location}, you
+ can find it in the source at ${ds-source-location} -->
+ <jta-data-source>@projectName@Datasource</jta-data-source>
+ <properties>
+ <!-- Properties for Hibernate -->
+ <!--
+ <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+ -->
+ <!-- Print's out the SQL statement Hibernate is using to the console, useful for debugging -->
+ <property name="hibernate.show_sql" value="false" />
+ </properties>
+ </persistence-unit>
+</persistence>
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/persistence-xml-default.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 7 months
JBoss Tools SVN: r41652 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-06-01 20:03:13 -0400 (Fri, 01 Jun 2012)
New Revision: 41652
Added:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/DisabledAnnotation.java
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
Log:
https://issues.jboss.org/browse/JBIDE-10738 As-you-type EL validation
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java 2012-06-01 23:41:40 UTC (rev 41651)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java 2012-06-02 00:03:13 UTC (rev 41652)
@@ -103,6 +103,9 @@
if(attributes!=null && attributes.get(TempMarkerManager.AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE)!=null) {
anModel.removeAnnotation(annotation);
}
+ } else if(o instanceof DisabledAnnotation) {
+ DisabledAnnotation annotation = (DisabledAnnotation)o;
+ anModel.removeAnnotation(annotation);
}
}
}
Added: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/DisabledAnnotation.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/DisabledAnnotation.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/DisabledAnnotation.java 2012-06-02 00:03:13 UTC (rev 41652)
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.validation;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationAccessExtension;
+import org.eclipse.jface.text.source.IAnnotationPresentation;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.internal.WorkbenchImages;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.eclipse.ui.internal.util.BundleUtility;
+import org.eclipse.ui.texteditor.AnnotationPreference;
+import org.eclipse.ui.texteditor.AnnotationPreferenceLookup;
+import org.eclipse.ui.texteditor.ImageUtilities;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class DisabledAnnotation extends Annotation implements IAnnotationPresentation {
+
+ private static final int WARNING_LAYER;
+ private static final int ERROR_LAYER;
+
+ private Map<String, Object> fAttributes = new HashMap<String, Object>();
+
+ private int seveirty = WARNING_LAYER;
+
+ static {
+ AnnotationPreferenceLookup lookup = EditorsUI.getAnnotationPreferenceLookup();
+ WARNING_LAYER = computeLayer("org.eclipse.wst.sse.ui.temp.warning", lookup); //$NON-NLS-1$
+ ERROR_LAYER = computeLayer("org.eclipse.wst.sse.ui.temp.error", lookup); //$NON-NLS-1$
+ }
+
+ private static int computeLayer(String annotationType, AnnotationPreferenceLookup lookup) {
+ Annotation annotation = new Annotation(annotationType, false, null);
+ AnnotationPreference preference= lookup.getAnnotationPreference(annotation);
+ if (preference != null) {
+ return preference.getPresentationLayer() + 1;
+ } else {
+ return IAnnotationAccessExtension.DEFAULT_LAYER + 1;
+ }
+ }
+
+ public DisabledAnnotation(String type, boolean isPersistent, String text, boolean warning) {
+ super(type, isPersistent, text);
+ this.seveirty = warning?WARNING_LAYER:ERROR_LAYER;
+ }
+
+ @Override
+ public int getLayer() {
+ return seveirty;
+ }
+
+ @Override
+ public void paint(GC gc, Canvas canvas, Rectangle bounds) {
+ String path = seveirty==WARNING_LAYER? (WorkbenchImages.ICONS_PATH + "dlcl16/showwarn_tsk.gif") : (WorkbenchImages.ICONS_PATH + "dlcl16/showerr_tsk.gif"); //$NON-NLS-1$
+ URL url = BundleUtility.find(IDEWorkbenchPlugin.IDE_WORKBENCH, path);
+ ImageDescriptor descriptor = ImageDescriptor.createFromURL(url);
+ Image image = descriptor.createImage(false);
+ ImageUtilities.drawImage(image, gc, canvas, bounds, SWT.CENTER, SWT.TOP);
+ }
+
+ public Object getAttribute(String key) {
+ return fAttributes.get(key);
+ }
+
+ public void setAttribute(String key, Object value) {
+ fAttributes.put(key, value);
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/DisabledAnnotation.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-06-01 23:41:40 UTC (rev 41651)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-06-02 00:03:13 UTC (rev 41652)
@@ -11,9 +11,11 @@
package org.jboss.tools.common.validation;
import java.text.MessageFormat;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
+import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
@@ -24,6 +26,8 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.IAnnotationModel;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.progress.UIJob;
@@ -96,50 +100,8 @@
reporter.addMessage(validator, message);
return message;
}
-/*
- static class DisabledAnnotation extends Annotation implements IAnnotationPresentation {
- private static final int WARNING_LAYER;
- private static final int ERROR_LAYER;
-
- static {
- AnnotationPreferenceLookup lookup = EditorsUI.getAnnotationPreferenceLookup();
- WARNING_LAYER = computeLayer("org.eclipse.wst.sse.ui.temp.warning", lookup); //$NON-NLS-1$
- ERROR_LAYER = computeLayer("org.eclipse.wst.sse.ui.temp.error", lookup); //$NON-NLS-1$
- }
-
- private static int computeLayer(String annotationType, AnnotationPreferenceLookup lookup) {
- Annotation annotation = new Annotation(annotationType, false, null);
- AnnotationPreference preference= lookup.getAnnotationPreference(annotation);
- if (preference != null) {
- return preference.getPresentationLayer() + 1;
- } else {
- return IAnnotationAccessExtension.DEFAULT_LAYER + 1;
- }
- }
-
- public DisabledAnnotation(String type, boolean isPersistent, String text) {
- super(type, isPersistent, text);
- }
-
- @Override
- public int getLayer() {
- return WARNING_LAYER;
- }
-
- @Override
- public void paint(GC gc, Canvas canvas, Rectangle bounds) {
- String path = WorkbenchImages.ICONS_PATH + "dlcl16/showwarn_tsk.gif"; //$NON-NLS-1$
- URL url = BundleUtility.find(IDEWorkbenchPlugin.IDE_WORKBENCH, path);
- ImageDescriptor descriptor = ImageDescriptor.createFromURL(url);
- Image image = descriptor.createImage(false);
-// ImageUtilities.drawImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK), gc, canvas, bounds, SWT.CENTER, SWT.TOP);
- ImageUtilities.drawImage(image, gc, canvas, bounds, SWT.CENTER, SWT.TOP);
- }
- }
-*/
protected void disableProblemAnnotations(final ITextSourceReference reference) {
- // Remove (TODO disable) all the existing problem annotations for the reference in case of as-you-type validation
UIJob job = new UIJob("As-you-type JBT validation. Disabling the marker annotations.") {
public IStatus runInUIThread(IProgressMonitor monitor) {
ITextEditor e = EclipseUIUtil.getActiveEditor();
@@ -153,7 +115,7 @@
synchronized (anModel.getLockObject()) {
Iterator iterator = anModel.getAnnotationIterator(reference.getStartPosition(), reference.getLength(), true, true);
Set<MarkerAnnotation> annotationsToRemove = new HashSet<MarkerAnnotation>();
-// Map<Annotation, Position> newAnnotations = new HashMap<Annotation, Position>();
+ Map<Annotation, Position> newAnnotations = new HashMap<Annotation, Position>();
while (iterator.hasNext()) {
Object o = iterator.next();
if(o instanceof MarkerAnnotation) {
@@ -162,11 +124,11 @@
try {
String type = marker.getType();
if(getMarkerType().equals(type)) {
-// Annotation newAnnotation = new DisabledAnnotation(annotation.getType(), false, annotation.getText());
-// int offset = marker.getAttribute(IMarker.CHAR_START, 0);
-// int length = 0; // marker.getAttribute(IMarker.CHAR_END, 0) - offset;
-// Position p = new Position(offset, length);
-// newAnnotations.put(newAnnotation, p);
+ Annotation newAnnotation = new DisabledAnnotation(annotation.getType(), false, annotation.getText(), marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING) == IMarker.SEVERITY_WARNING);
+ int offset = marker.getAttribute(IMarker.CHAR_START, 0);
+ int length = 0; // marker.getAttribute(IMarker.CHAR_END, 0) - offset;
+ Position p = new Position(offset, length);
+ newAnnotations.put(newAnnotation, p);
annotationsToRemove.add(annotation);
}
} catch (CoreException ce) {
@@ -181,9 +143,9 @@
for (MarkerAnnotation annotation : annotationsToRemove) {
anModel.removeAnnotation(annotation);
}
-// for (Annotation annotation : newAnnotations.keySet()) {
-// anModel.addAnnotation(annotation, newAnnotations.get(annotation));
-// }
+ for (Annotation annotation : newAnnotations.keySet()) {
+ anModel.addAnnotation(annotation, newAnnotations.get(annotation));
+ }
}
}
}
12 years, 7 months
JBoss Tools SVN: r41651 - branches/jbosstools-3.3.x/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2012-06-01 19:41:40 -0400 (Fri, 01 Jun 2012)
New Revision: 41651
Modified:
branches/jbosstools-3.3.x/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
Log:
https://issues.jboss.org/browse/JBIDE-11928 - revert previous change
Modified: branches/jbosstools-3.3.x/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
===================================================================
--- branches/jbosstools-3.3.x/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2012-06-01 23:32:06 UTC (rev 41650)
+++ branches/jbosstools-3.3.x/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2012-06-01 23:41:40 UTC (rev 41651)
@@ -99,9 +99,8 @@
status = publish(module, delta, publishType, monitor);
publishState = IServer.PUBLISH_STATE_NONE;
} else if( publishType == INCREMENTAL_PUBLISH ) {
- // Incremental is treated like Full Publish
- status = publish(module, delta, publishType, monitor);
- publishState = IServer.PUBLISH_STATE_NONE;
+ // Do nothing. This is intentional
+ publishState = IServer.PUBLISH_STATE_INCREMENTAL;
}
// https://issues.jboss.org/browse/JBDS-1573
// hack: display a warning dialog.
12 years, 7 months
JBoss Tools SVN: r41650 - trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2012-06-01 19:32:06 -0400 (Fri, 01 Jun 2012)
New Revision: 41650
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
Log:
https://issues.jboss.org/browse/JBIDE-11928 - reverted the previous commit so that behavior is the same as before.
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2012-06-01 23:31:01 UTC (rev 41649)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2012-06-01 23:32:06 UTC (rev 41650)
@@ -99,9 +99,8 @@
status = publish(module, delta, publishType, monitor);
publishState = IServer.PUBLISH_STATE_NONE;
} else if( publishType == INCREMENTAL_PUBLISH ) {
- // Incremental is treated like Full Publish
- status = publish(module, delta, publishType, monitor);
- publishState = IServer.PUBLISH_STATE_NONE;
+ // Do nothing. This is intentional
+ publishState = IServer.PUBLISH_STATE_INCREMENTAL;
}
// https://issues.jboss.org/browse/JBDS-1573
// hack: display a warning dialog.
12 years, 7 months