JBoss Tools SVN: r33685 - workspace/bfitzpat/SOA_5_2_Examples.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-08-08 15:14:24 -0400 (Mon, 08 Aug 2011)
New Revision: 33685
Modified:
workspace/bfitzpat/SOA_5_2_Examples/aggregator_eclipse.zip
workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml
Log:
SOA-2988 - updating XML config for project examples and one of the example zips
Modified: workspace/bfitzpat/SOA_5_2_Examples/aggregator_eclipse.zip
===================================================================
(Binary files differ)
Modified: workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml
===================================================================
--- workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml 2011-08-08 18:22:32 UTC (rev 33684)
+++ workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml 2011-08-08 19:14:24 UTC (rev 33685)
@@ -2,7 +2,7 @@
<project>
<category>SOA-P 5.2 Examples Importable By Eclipse</category>
<name>aggregator_eclipse</name>
- <included-projects>aggregator_aggregation_eclipse,aggregator_blue_service_eclipse,aggregator_eclipse_test,_aggregator_green_service_eclipse,aggregator_inbound_splitter_eclipse,aggregator_red_service_eclipse</included-projects>
+ <included-projects>aggregator_aggregation_eclipse,aggregator_blue_service_eclipse,aggregator_eclipse_test,aggregator_green_service_eclipse,aggregator_inbound_splitter_eclipse,aggregator_red_service_eclipse</included-projects>
<shortDescription>aggregator_eclipse</shortDescription>
<description>The purpose of this particular example is to demonstrate the Enterprise Integration Patterns of Splitter and Aggregator. In addition, this example demonstrates the concepts of multiple JVMs, each running unique services but all working in concert, a federated model that shares a common registry and uses JMS between the JVMs.</description>
<size>33848</size> <!-- size of the zip file -->
@@ -10,7 +10,7 @@
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
- <property name="eclipse-projects">aggregator_aggregation_eclipse,aggregator_blue_service_eclipse,aggregator_eclipse_test,_aggregator_green_service_eclipse,aggregator_inbound_splitter_eclipse,aggregator_red_service_eclipse</property>
+ <property name="eclipse-projects">aggregator_aggregation_eclipse,aggregator_blue_service_eclipse,aggregator_eclipse_test,aggregator_green_service_eclipse,aggregator_inbound_splitter_eclipse,aggregator_red_service_eclipse</property>
<property name="required-components">esb</property>
<property name="description">This project example requires the JBoss SOA-P 5.x</property>
</fix>
14 years, 8 months
JBoss Tools SVN: r33684 - trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-08 14:22:32 -0400 (Mon, 08 Aug 2011)
New Revision: 33684
Modified:
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/build.properties
Log:
freemarker test errors fix
Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/build.properties
===================================================================
--- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/build.properties 2011-08-08 17:50:38 UTC (rev 33683)
+++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/build.properties 2011-08-08 18:22:32 UTC (rev 33684)
@@ -1,18 +1,18 @@
-source.freemarker-ide.jar = src/
-output.freemarker-ide.jar = bin/
-jars.compile.order = freemarker-2.3.18.jar
+jars.compile.order = freemarker-ide.jar
bin.includes = plugin.*,\
freemarker-2.3.18.jar,\
META-INF/,\
.,\
icons/,\
License.txt,\
- freemarker-2.3.18.jar,\
about.*,\
- jboss_about.png
+ jboss_about.png,\
+ freemarker-ide.jar
src.includes = src/,\
plugin.*,\
icons/,\
META-INF/,\
License.txt,\
freemarker-2.3.18.jar
+source.freemarker-ide.jar = src/
+output.freemarker-ide.jar = bin/
14 years, 8 months
JBoss Tools SVN: r33683 - workspace/bfitzpat/SOA_5_2_Examples.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-08-08 13:50:38 -0400 (Mon, 08 Aug 2011)
New Revision: 33683
Modified:
workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml
Log:
SOA-2988 - updating XML config for project examples
Modified: workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml
===================================================================
--- workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml 2011-08-08 17:47:47 UTC (rev 33682)
+++ workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml 2011-08-08 17:50:38 UTC (rev 33683)
@@ -2,7 +2,7 @@
<project>
<category>SOA-P 5.2 Examples Importable By Eclipse</category>
<name>aggregator_eclipse</name>
- <included-projects>aggregator_eclipse</included-projects>
+ <included-projects>aggregator_aggregation_eclipse,aggregator_blue_service_eclipse,aggregator_eclipse_test,_aggregator_green_service_eclipse,aggregator_inbound_splitter_eclipse,aggregator_red_service_eclipse</included-projects>
<shortDescription>aggregator_eclipse</shortDescription>
<description>The purpose of this particular example is to demonstrate the Enterprise Integration Patterns of Splitter and Aggregator. In addition, this example demonstrates the concepts of multiple JVMs, each running unique services but all working in concert, a federated model that shares a common registry and uses JMS between the JVMs.</description>
<size>33848</size> <!-- size of the zip file -->
@@ -19,7 +19,7 @@
<project>
<category>SOA-P 5.2 Examples Importable By Eclipse</category>
<name>business_service_eclipse</name>
- <included-projects>business_service_eclipse</included-projects>
+ <included-projects>business_service_eclipse,business_service_eclipse_test</included-projects>
<shortDescription>business_service_eclipse</shortDescription>
<description>This example demonstrates the how to access an EJB3 Stateless Session Bean from within an ESB Action. ESB Actions are primarily custom mediation components which allow you to introduce different specialized transformations, routing behaviors, orchestration, etc. The EJB3 is a simple "Hello World" annotated POJO.</description>
<size>13239</size> <!-- size of the zip file -->
@@ -36,7 +36,7 @@
<project>
<category>SOA-P 5.2 Examples Importable By Eclipse</category>
<name>custom_action_eclipse</name>
- <included-projects>custom_action_eclipse</included-projects>
+ <included-projects>custom_action_eclipse,custom_action_eclipse_test</included-projects>
<shortDescription>custom_action_eclipse</shortDescription>
<description>The purpose of the custom_action quickstart example is to show different ways of using Action classes.</description>
<size>16398</size> <!-- size of the zip file -->
@@ -53,7 +53,7 @@
<project>
<category>SOA-P 5.2 Examples Importable By Eclipse</category>
<name>fun_cbr_eclipse</name>
- <included-projects>fun_cbr_eclipse</included-projects>
+ <included-projects>fun_cbr_eclipse,fun_cbr_eclipse_test</included-projects>
<shortDescription>fun_cbr_eclipse</shortDescription>
<description>This example has three "teams" of order processors. All new orders that flow into the system can be evaluated via the XPath or Drools rule processors. These routing rules will determine which team receives the order for actually processing. In the case of the green team, the order is first transformed to a different format prior to routing.</description>
<size>25866</size> <!-- size of the zip file -->
@@ -70,7 +70,7 @@
<project>
<category>SOA-P 5.2 Examples Importable By Eclipse</category>
<name>helloworld_action_eclipse</name>
- <included-projects>helloworld_action_eclipse</included-projects>
+ <included-projects>helloworld_action_eclipse,helloworld_action_eclipse_test</included-projects>
<shortDescription>helloworld_action_eclipse</shortDescription>
<description>The purpose of the helloworld_action quickstart sample is to show the use of multiple action invocations from a single configuration. You can use a single Action class and make multiple method calls or use multiple Action classes</description>
<size>8156</size> <!-- size of the zip file -->
@@ -87,7 +87,7 @@
<project>
<category>SOA-P 5.2 Examples Importable By Eclipse</category>
<name>helloworld_eclipse</name>
- <included-projects>helloworld_eclipse</included-projects>
+ <included-projects>helloworld_eclipse,helloworld_eclipse_test</included-projects>
<shortDescription>helloworld_eclipse</shortDescription>
<description>The purpose of the helloworld quickstart sample is to prove that the ESB is properly configured and happy. As well as to demonstrate the needed minimal files to make a basic ESB component execute.</description>
<size>6262</size> <!-- size of the zip file -->
@@ -104,7 +104,7 @@
<project>
<category>SOA-P 5.2 Examples Importable By Eclipse</category>
<name>simple_cbr_eclipse</name>
- <included-projects>simple_cbr_eclipse</included-projects>
+ <included-projects>simple_cbr_eclipse,simple_cbr_eclipse_test</included-projects>
<shortDescription>simple_cbr_eclipse</shortDescription>
<description>The purpose of the simple_cbr quickstart is to demonstrate the Content Based Router in JBoss ESB.</description>
<size>17630</size> <!-- size of the zip file -->
@@ -121,7 +121,7 @@
<project>
<category>SOA-P 5.2 Examples Importable By Eclipse</category>
<name>static_router_eclipse</name>
- <included-projects>static_router_eclipse</included-projects>
+ <included-projects>static_router_eclipse,static_router_eclipse_test</included-projects>
<shortDescription>static_router_eclipse</shortDescription>
<description>This quick start will create a file on the FTP server and show the progress of the message through a static route. Intermediate files will be created in the directories under build/dirs/</description>
<size>6194</size> <!-- size of the zip file -->
@@ -138,7 +138,7 @@
<project>
<category>SOA-P 5.2 Examples Importable By Eclipse</category>
<name>transform_XML2POJO_eclipse</name>
- <included-projects>transform_XML2POJO_eclipse</included-projects>
+ <included-projects>transform_XML2POJO_eclipse,transform_XML2POJO_eclipse_test</included-projects>
<shortDescription>transform_XML2POJO_eclipse</shortDescription>
<description>The purpose of the simple_transformation quickstart sample is to illustrate the use of Smooks performing a simple transformation by converting a XML file into Java POJOs.</description>
<size>23662</size> <!-- size of the zip file -->
14 years, 8 months
JBoss Tools SVN: r33682 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-08 13:47:47 -0400 (Mon, 08 Aug 2011)
New Revision: 33682
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
JobUtils.waitForIdle(1000) removed after project.open(), because it is not required
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2011-08-08 17:41:29 UTC (rev 33681)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2011-08-08 17:47:47 UTC (rev 33682)
@@ -230,7 +230,7 @@
// importProjectIntoWorkspace(bean);
//}
- private static final long IMPORT_DELAY = 1000;
+ private static final long IMPORT_DELAY = 200;
static public IProject importProjectIntoWorkspace(String path, String projectName) {
return importProjectIntoWorkspace(path, projectName,"file");
@@ -253,8 +253,7 @@
if (!project.exists())
project.create(null);
project.open(null);
- JobUtils.waitForIdle(IMPORT_DELAY);
-
+
IOverwriteQuery overwrite = new IOverwriteQuery() {
public String queryOverwrite(String pathString) {
return ALL;
@@ -302,7 +301,7 @@
// run import
importOp.run(null);
ResourcesUtils.setBuildAutomatically(state);
-
+
JobUtils.waitForIdle(IMPORT_DELAY);
} catch (InvocationTargetException ite) {
// TePlugin.getDefault().logError(ite.getCause());
14 years, 8 months
JBoss Tools SVN: r33681 - workspace/bfitzpat/SOA_5_2_Examples.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-08-08 13:41:29 -0400 (Mon, 08 Aug 2011)
New Revision: 33681
Modified:
workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml
Log:
SOA-2988 - updating paths to zips
Modified: workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml
===================================================================
--- workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml 2011-08-08 17:40:13 UTC (rev 33680)
+++ workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml 2011-08-08 17:41:29 UTC (rev 33681)
@@ -6,7 +6,7 @@
<shortDescription>aggregator_eclipse</shortDescription>
<description>The purpose of this particular example is to demonstrate the Enterprise Integration Patterns of Splitter and Aggregator. In addition, this example demonstrates the concepts of multiple JVMs, each running unique services but all working in concert, a federated model that shares a common registry and uses JMS between the JVMs.</description>
<size>33848</size> <!-- size of the zip file -->
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_2_Exam...</url>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
@@ -23,7 +23,7 @@
<shortDescription>business_service_eclipse</shortDescription>
<description>This example demonstrates the how to access an EJB3 Stateless Session Bean from within an ESB Action. ESB Actions are primarily custom mediation components which allow you to introduce different specialized transformations, routing behaviors, orchestration, etc. The EJB3 is a simple "Hello World" annotated POJO.</description>
<size>13239</size> <!-- size of the zip file -->
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_2_Exam...</url>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
@@ -40,7 +40,7 @@
<shortDescription>custom_action_eclipse</shortDescription>
<description>The purpose of the custom_action quickstart example is to show different ways of using Action classes.</description>
<size>16398</size> <!-- size of the zip file -->
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_2_Exam...</url>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
@@ -57,7 +57,7 @@
<shortDescription>fun_cbr_eclipse</shortDescription>
<description>This example has three "teams" of order processors. All new orders that flow into the system can be evaluated via the XPath or Drools rule processors. These routing rules will determine which team receives the order for actually processing. In the case of the green team, the order is first transformed to a different format prior to routing.</description>
<size>25866</size> <!-- size of the zip file -->
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_2_Exam...</url>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
@@ -74,7 +74,7 @@
<shortDescription>helloworld_action_eclipse</shortDescription>
<description>The purpose of the helloworld_action quickstart sample is to show the use of multiple action invocations from a single configuration. You can use a single Action class and make multiple method calls or use multiple Action classes</description>
<size>8156</size> <!-- size of the zip file -->
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_2_Exam...</url>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
@@ -91,7 +91,7 @@
<shortDescription>helloworld_eclipse</shortDescription>
<description>The purpose of the helloworld quickstart sample is to prove that the ESB is properly configured and happy. As well as to demonstrate the needed minimal files to make a basic ESB component execute.</description>
<size>6262</size> <!-- size of the zip file -->
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_2_Exam...</url>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
@@ -108,7 +108,7 @@
<shortDescription>simple_cbr_eclipse</shortDescription>
<description>The purpose of the simple_cbr quickstart is to demonstrate the Content Based Router in JBoss ESB.</description>
<size>17630</size> <!-- size of the zip file -->
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_2_Exam...</url>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
@@ -125,7 +125,7 @@
<shortDescription>static_router_eclipse</shortDescription>
<description>This quick start will create a file on the FTP server and show the progress of the message through a static route. Intermediate files will be created in the directories under build/dirs/</description>
<size>6194</size> <!-- size of the zip file -->
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_2_Exam...</url>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
@@ -142,7 +142,7 @@
<shortDescription>transform_XML2POJO_eclipse</shortDescription>
<description>The purpose of the simple_transformation quickstart sample is to illustrate the use of Smooks performing a simple transformation by converting a XML file into Java POJOs.</description>
<size>23662</size> <!-- size of the zip file -->
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_2_Exam...</url>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
14 years, 8 months
JBoss Tools SVN: r33680 - in workspace/bfitzpat: SOA_5_2_Examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-08-08 13:40:13 -0400 (Mon, 08 Aug 2011)
New Revision: 33680
Added:
workspace/bfitzpat/SOA_5_2_Examples/
workspace/bfitzpat/SOA_5_2_Examples/aggregator_eclipse.zip
workspace/bfitzpat/SOA_5_2_Examples/business_service_eclipse.zip
workspace/bfitzpat/SOA_5_2_Examples/custom_action_eclipse.zip
workspace/bfitzpat/SOA_5_2_Examples/fun_cbr_eclipse.zip
workspace/bfitzpat/SOA_5_2_Examples/helloworld_action_eclipse.zip
workspace/bfitzpat/SOA_5_2_Examples/helloworld_eclipse.zip
workspace/bfitzpat/SOA_5_2_Examples/simple_cbr_eclipse.zip
workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml
workspace/bfitzpat/SOA_5_2_Examples/static_router_eclipse.zip
workspace/bfitzpat/SOA_5_2_Examples/transform_XML2POJO_eclipse.zip
Log:
SOA-2988 - 2nd round of examples with tests to validate/test prior to including with JBDS 4.1.1
Added: workspace/bfitzpat/SOA_5_2_Examples/aggregator_eclipse.zip
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/SOA_5_2_Examples/aggregator_eclipse.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/SOA_5_2_Examples/business_service_eclipse.zip
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/SOA_5_2_Examples/business_service_eclipse.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/SOA_5_2_Examples/custom_action_eclipse.zip
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/SOA_5_2_Examples/custom_action_eclipse.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/SOA_5_2_Examples/fun_cbr_eclipse.zip
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/SOA_5_2_Examples/fun_cbr_eclipse.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/SOA_5_2_Examples/helloworld_action_eclipse.zip
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/SOA_5_2_Examples/helloworld_action_eclipse.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/SOA_5_2_Examples/helloworld_eclipse.zip
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/SOA_5_2_Examples/helloworld_eclipse.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/SOA_5_2_Examples/simple_cbr_eclipse.zip
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/SOA_5_2_Examples/simple_cbr_eclipse.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml
===================================================================
--- workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml (rev 0)
+++ workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml 2011-08-08 17:40:13 UTC (rev 33680)
@@ -0,0 +1,155 @@
+<projects>
+ <project>
+ <category>SOA-P 5.2 Examples Importable By Eclipse</category>
+ <name>aggregator_eclipse</name>
+ <included-projects>aggregator_eclipse</included-projects>
+ <shortDescription>aggregator_eclipse</shortDescription>
+ <description>The purpose of this particular example is to demonstrate the Enterprise Integration Patterns of Splitter and Aggregator. In addition, this example demonstrates the concepts of multiple JVMs, each running unique services but all working in concert, a federated model that shares a common registry and uses JMS between the JVMs.</description>
+ <size>33848</size> <!-- size of the zip file -->
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">aggregator_aggregation_eclipse,aggregator_blue_service_eclipse,aggregator_eclipse_test,_aggregator_green_service_eclipse,aggregator_inbound_splitter_eclipse,aggregator_red_service_eclipse</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss SOA-P 5.x</property>
+ </fix>
+ </fixes>
+ </project>
+ <project>
+ <category>SOA-P 5.2 Examples Importable By Eclipse</category>
+ <name>business_service_eclipse</name>
+ <included-projects>business_service_eclipse</included-projects>
+ <shortDescription>business_service_eclipse</shortDescription>
+ <description>This example demonstrates the how to access an EJB3 Stateless Session Bean from within an ESB Action. ESB Actions are primarily custom mediation components which allow you to introduce different specialized transformations, routing behaviors, orchestration, etc. The EJB3 is a simple "Hello World" annotated POJO.</description>
+ <size>13239</size> <!-- size of the zip file -->
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">business_service_eclipse,business_service_eclipse_test</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss SOA-P 5.x</property>
+ </fix>
+ </fixes>
+ </project>
+ <project>
+ <category>SOA-P 5.2 Examples Importable By Eclipse</category>
+ <name>custom_action_eclipse</name>
+ <included-projects>custom_action_eclipse</included-projects>
+ <shortDescription>custom_action_eclipse</shortDescription>
+ <description>The purpose of the custom_action quickstart example is to show different ways of using Action classes.</description>
+ <size>16398</size> <!-- size of the zip file -->
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">custom_action_eclipse,custom_action_eclipse_test</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss SOA-P 5.x</property>
+ </fix>
+ </fixes>
+ </project>
+ <project>
+ <category>SOA-P 5.2 Examples Importable By Eclipse</category>
+ <name>fun_cbr_eclipse</name>
+ <included-projects>fun_cbr_eclipse</included-projects>
+ <shortDescription>fun_cbr_eclipse</shortDescription>
+ <description>This example has three "teams" of order processors. All new orders that flow into the system can be evaluated via the XPath or Drools rule processors. These routing rules will determine which team receives the order for actually processing. In the case of the green team, the order is first transformed to a different format prior to routing.</description>
+ <size>25866</size> <!-- size of the zip file -->
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">fun_cbr_eclipse,fun_cbr_eclipse_test</property>
+ <property name="required-components">esb,drools</property>
+ <property name="description">This project example requires the JBoss SOA-P 5.x</property>
+ </fix>
+ </fixes>
+ </project>
+ <project>
+ <category>SOA-P 5.2 Examples Importable By Eclipse</category>
+ <name>helloworld_action_eclipse</name>
+ <included-projects>helloworld_action_eclipse</included-projects>
+ <shortDescription>helloworld_action_eclipse</shortDescription>
+ <description>The purpose of the helloworld_action quickstart sample is to show the use of multiple action invocations from a single configuration. You can use a single Action class and make multiple method calls or use multiple Action classes</description>
+ <size>8156</size> <!-- size of the zip file -->
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">helloworld_action_eclipse,helloworld_action_eclipse_test</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss SOA-P 5.x</property>
+ </fix>
+ </fixes>
+ </project>
+ <project>
+ <category>SOA-P 5.2 Examples Importable By Eclipse</category>
+ <name>helloworld_eclipse</name>
+ <included-projects>helloworld_eclipse</included-projects>
+ <shortDescription>helloworld_eclipse</shortDescription>
+ <description>The purpose of the helloworld quickstart sample is to prove that the ESB is properly configured and happy. As well as to demonstrate the needed minimal files to make a basic ESB component execute.</description>
+ <size>6262</size> <!-- size of the zip file -->
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">helloworld_eclipse,helloworld_eclipse_test</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss SOA-P 5.x</property>
+ </fix>
+ </fixes>
+ </project>
+ <project>
+ <category>SOA-P 5.2 Examples Importable By Eclipse</category>
+ <name>simple_cbr_eclipse</name>
+ <included-projects>simple_cbr_eclipse</included-projects>
+ <shortDescription>simple_cbr_eclipse</shortDescription>
+ <description>The purpose of the simple_cbr quickstart is to demonstrate the Content Based Router in JBoss ESB.</description>
+ <size>17630</size> <!-- size of the zip file -->
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">simple_cbr_eclipse,simple_cbr_eclipse_test</property>
+ <property name="required-components">esb,drools</property>
+ <property name="description">This project example requires the JBoss SOA-P 5.x</property>
+ </fix>
+ </fixes>
+ </project>
+ <project>
+ <category>SOA-P 5.2 Examples Importable By Eclipse</category>
+ <name>static_router_eclipse</name>
+ <included-projects>static_router_eclipse</included-projects>
+ <shortDescription>static_router_eclipse</shortDescription>
+ <description>This quick start will create a file on the FTP server and show the progress of the message through a static route. Intermediate files will be created in the directories under build/dirs/</description>
+ <size>6194</size> <!-- size of the zip file -->
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">static_router_eclipse,static_router_eclipse_test</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss SOA-P 5.x</property>
+ </fix>
+ </fixes>
+ </project>
+ <project>
+ <category>SOA-P 5.2 Examples Importable By Eclipse</category>
+ <name>transform_XML2POJO_eclipse</name>
+ <included-projects>transform_XML2POJO_eclipse</included-projects>
+ <shortDescription>transform_XML2POJO_eclipse</shortDescription>
+ <description>The purpose of the simple_transformation quickstart sample is to illustrate the use of Smooks performing a simple transformation by converting a XML file into Java POJOs.</description>
+ <size>23662</size> <!-- size of the zip file -->
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/bfitzpat/SOA_5_1_Exam...</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">transform_XML2POJO_eclipse,transform_XML2POJO_eclipse_test</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss SOA-P 5.x</property>
+ </fix>
+ </fixes>
+ </project>
+ </projects>
\ No newline at end of file
Property changes on: workspace/bfitzpat/SOA_5_2_Examples/soa-p-5.2-samples.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/SOA_5_2_Examples/static_router_eclipse.zip
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/SOA_5_2_Examples/static_router_eclipse.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/SOA_5_2_Examples/transform_XML2POJO_eclipse.zip
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/SOA_5_2_Examples/transform_XML2POJO_eclipse.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 8 months
JBoss Tools SVN: r33679 - trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-08 11:59:02 -0400 (Mon, 08 Aug 2011)
New Revision: 33679
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
Log:
JBIDE-8969 Fixed source value for multiple definitions
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-08-08 15:32:36 UTC (rev 33678)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-08-08 15:59:02 UTC (rev 33679)
@@ -74,8 +74,6 @@
return null;
}
- System.out.print("Select projects " + facades); //$NON-NLS-1$
-
final IProfileManager profileManager = MavenCoreActivator.getDefault().getProfileManager();
GetProfilesJob getProfilesJob = new GetProfilesJob(facades, profileManager);
@@ -250,7 +248,7 @@
p.setAutoActive(null);
}
if (p.getSource() != null && !p.getSource().equals(s.getSource())) {
- p.setSource(null);
+ p.setSource("multiple definitions");
}
if (p.getSelected() != null && !p.getSelected().equals(s.isUserSelected())) {
p.setSelected(null);
14 years, 8 months
JBoss Tools SVN: r33678 - trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-08 11:32:36 -0400 (Mon, 08 Aug 2011)
New Revision: 33678
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
Log:
[JBIDE-8969] moved profile fetching to background job
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-08-08 14:24:08 UTC (rev 33677)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-08-08 15:32:36 UTC (rev 33678)
@@ -33,13 +33,18 @@
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.IJobChangeListener;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.internal.IMavenConstants;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IWorkbenchWindow;
@@ -53,116 +58,58 @@
import org.jboss.tools.maven.ui.Messages;
/**
- * Handles profile selection commands.
+ * Handles profile selection commands.
*/
public class ProfileSelectionHandler extends AbstractHandler {
/**
- * Opens the Maven profile selection Dialog window.
+ * Opens the Maven profile selection Dialog window.
*/
public Object execute(ExecutionEvent event) throws ExecutionException {
IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
- final Set<IMavenProjectFacade> facades = getSelectedMavenProjects(event);
-
+ Set<IMavenProjectFacade> facades = getSelectedMavenProjects(event);
+
if (facades.isEmpty()) {
display(window, Messages.ProfileSelectionHandler_Select_some_maven_projects);
return null;
}
- System.out.print("Select projects "+facades); //$NON-NLS-1$
-
+ System.out.print("Select projects " + facades); //$NON-NLS-1$
+
final IProfileManager profileManager = MavenCoreActivator.getDefault().getProfileManager();
- final List<ProfileSelection> sharedProfiles;
- final Map<IMavenProjectFacade, List<ProfileStatus>> allProfiles;
- try {
- allProfiles = getAllProfiles(facades, profileManager);
- sharedProfiles = getSharedProfiles(allProfiles);
- } catch (CoreException e) {
- throw new ExecutionException(Messages.ProfileSelectionHandler_Unable_to_open_profile_dialog, e);
- }
- final SelectProfilesDialog dialog = new SelectProfilesDialog(window.getShell(),
- facades,
- sharedProfiles);
- if(dialog.open() == Window.OK) {
-
- WorkspaceJob job = new WorkspaceJob(Messages.ProfileManager_Updating_maven_profiles) {
- public IStatus runInWorkspace(IProgressMonitor monitor) {
- try {
- SubMonitor progress = SubMonitor.convert(monitor, Messages.ProfileManager_Updating_maven_profiles, 100);
- SubMonitor subProgress = SubMonitor.convert(progress.newChild(5), allProfiles.size() * 100);
- for (Map.Entry<IMavenProjectFacade, List<ProfileStatus>> entry : allProfiles.entrySet()){
- if(progress.isCanceled()) {
- throw new OperationCanceledException();
- }
- IMavenProjectFacade facade = entry.getKey();
- List<String> activeProfiles = getActiveProfiles(sharedProfiles, entry.getValue());
-
- profileManager.updateActiveProfiles(facade, activeProfiles,
- dialog.isOffline(), dialog.isForceUpdate(), subProgress.newChild(100));
- }
- } catch (CoreException ex) {
- Activator.log(ex);
- return ex.getStatus();
- }
- return Status.OK_STATUS;
- }
+ GetProfilesJob getProfilesJob = new GetProfilesJob(facades, profileManager);
+ getProfilesJob.addJobChangeListener(onProfilesFetched(getProfilesJob, facades, profileManager, window.getShell()));
+ getProfilesJob.setUser(true);
+ getProfilesJob.schedule();
+ return Status.OK_STATUS;
+ }
- private List<String> getActiveProfiles(
- List<ProfileSelection> sharedProfiles,
- List<ProfileStatus> availableProfiles) {
- List<String> ids = new ArrayList<String>();
-
- for (ProfileStatus st : availableProfiles) {
- ProfileSelection selection = findSelectedProfile(st.getId(), sharedProfiles);
- String id = null;
- boolean isDisabled = false;
- if (selection == null) {
- //was not displayed. Use existing value.
- if (st.isUserSelected()) {
- id = st.getId();
- isDisabled = st.getActivationState().equals(ProfileState.Disabled);
- }
- } else {
- if (null == selection.getSelected()) {
- //Value was displayed but its state is unknown, use previous state
- if (st.isUserSelected()) {
- id = st.getId();
- isDisabled = st.getActivationState().equals(ProfileState.Disabled);
- }
- } else {
- //Value was displayed and is consistent
- if (Boolean.TRUE.equals(selection.getSelected())) {
- id = selection.getId();
- isDisabled = selection.getActivationState().equals(ProfileState.Disabled);
- }
- }
- }
+ private IJobChangeListener onProfilesFetched(final GetProfilesJob getProfilesJob, final Set<IMavenProjectFacade> facades, final IProfileManager profileManager, final Shell shell) {
+ return new JobChangeAdapter() {
+
+ @Override
+ public void done(IJobChangeEvent event) {
+ if (getProfilesJob.getResult().isOK()) {
+ shell.getDisplay().syncExec(new Runnable() {
- if (id != null) {
- if (isDisabled) {
- id = "!"+id; //$NON-NLS-1$
- }
- ids.add(id);
+ public void run() {
+ List<ProfileSelection> sharedProfiles = getProfilesJob.getSharedProfiles();
+ Map<IMavenProjectFacade, List<ProfileStatus>> allProfiles = getProfilesJob.getAllProfiles();
+ final SelectProfilesDialog dialog = new SelectProfilesDialog(shell,
+ facades,
+ sharedProfiles);
+ if(dialog.open() == Dialog.OK) {
+ Job job = new UpdateProfilesJob(allProfiles, sharedProfiles, profileManager, dialog);
+ job.setRule( MavenPlugin.getProjectConfigurationManager().getRule());
+ job.schedule();
+ }
}
- }
- return ids;
- }
+ });
- private ProfileSelection findSelectedProfile(String id,
- List<ProfileSelection> sharedProfiles) {
- for (ProfileSelection sel : sharedProfiles) {
- if (id.equals(sel.getId())) {
- return sel;
- }
- }
- return null;
}
- };
- job.setRule( MavenPlugin.getProjectConfigurationManager().getRule());
- job.schedule();
- }
- return null;
+ }
+ };
}
private void display(IWorkbenchWindow window, String message) {
@@ -172,89 +119,10 @@
message);
}
- private List<ProfileSelection> getSharedProfiles(
- Map<IMavenProjectFacade, List<ProfileStatus>> projectProfilesMap) {
-
- List<ProfileStatus> currentSelection = null;
- List<List<ProfileStatus>> projectProfiles = new ArrayList<List<ProfileStatus>>(projectProfilesMap.values());
- int smallestSize = Integer.MAX_VALUE;
- for(List<ProfileStatus> profiles : projectProfiles ){
- int size = profiles.size();
- if (size < smallestSize) {
- smallestSize = size;
- currentSelection = profiles;
- }
- }
- projectProfiles.remove(currentSelection);
-
- //Init the smallest profiles selection possible
- List<ProfileSelection> selection = new ArrayList<ProfileSelection>();
- for(ProfileStatus p : currentSelection) {
- ProfileSelection ps = new ProfileSelection();
- ps.setId(p.getId());
- ps.setActivationState(p.getActivationState());
- ps.setAutoActive(p.isAutoActive());
- ps.setSource(p.getSource());
- ps.setSelected(p.isUserSelected());
- selection.add(ps);
- }
-
- if (!projectProfiles.isEmpty()) {
- //Restrict to the common profiles only
- Iterator<ProfileSelection> ite = selection.iterator();
-
- while (ite.hasNext()) {
- ProfileSelection p = ite.next();
- for (List<ProfileStatus> statuses : projectProfiles) {
- ProfileStatus s = hasProfile(p.getId(), statuses);
- if (s == null) {
- //remove any non-common profile selection
- ite.remove();
- break;
- }
- //reset non common settings
- if (p.getAutoActive() != null && !p.getAutoActive().equals(s.isAutoActive())) {
- p.setAutoActive(null);
- }
- if (p.getSource() != null && !p.getSource().equals(s.getSource())) {
- p.setSource(null);
- }
- if (p.getSelected() != null && !p.getSelected().equals(s.isUserSelected())) {
- p.setSelected(null);
- }
- if (p.getActivationState() != null && !p.getActivationState().equals(s.getActivationState())){
- p.setActivationState(null);
- p.setAutoActive(null);
- }
- }
- }
- }
-
- return selection;
- }
-
- private ProfileStatus hasProfile(String id, List<ProfileStatus> statuses) {
- for (ProfileStatus p : statuses){
- if (id.equals(p.getId())){
- return p;
- }
- }
- return null;
- }
-
- private Map<IMavenProjectFacade, List<ProfileStatus>> getAllProfiles(final Set<IMavenProjectFacade> facades,
- final IProfileManager profileManager) throws CoreException {
- Map<IMavenProjectFacade, List<ProfileStatus>> allProfiles =
- new HashMap<IMavenProjectFacade, List<ProfileStatus>>(facades.size());
- IProgressMonitor monitor = new NullProgressMonitor();
- for (IMavenProjectFacade facade : facades) {
- allProfiles.put(facade, profileManager.getProfilesStatuses(facade, monitor));
- }
- return allProfiles;
- }
-
/**
- * Returns an IMavenProjectFacade from the selected IResource, or from the active editor
+ * Returns an IMavenProjectFacade from the selected IResource, or from the
+ * active editor
+ *
* @param event
* @return the selected IMavenProjectFacade
*/
@@ -264,11 +132,11 @@
Set<IMavenProjectFacade> facades = new HashSet<IMavenProjectFacade>();
try {
if (projects.length == 0) {
- IEditorInput input = HandlerUtil.getActiveEditorInput(event);
- if(input instanceof IFileEditorInput) {
- IFileEditorInput fileInput = (IFileEditorInput) input;
- projects = new IProject[]{fileInput.getFile().getProject()};
- }
+ IEditorInput input = HandlerUtil.getActiveEditorInput(event);
+ if (input instanceof IFileEditorInput) {
+ IFileEditorInput fileInput = (IFileEditorInput) input;
+ projects = new IProject[] { fileInput.getFile().getProject() };
+ }
}
IProgressMonitor monitor = new NullProgressMonitor();
for (IProject p : projects) {
@@ -293,14 +161,14 @@
while (it.hasNext()) {
Object o = it.next();
if (o instanceof IResource) {
- projects.add(((IResource) o).getProject());
+ projects.add(((IResource) o).getProject());
} else if (o instanceof IWorkingSet) {
- IAdaptable[] elements = ((IWorkingSet)o).getElements();
+ IAdaptable[] elements = ((IWorkingSet) o).getElements();
if (elements != null) {
for (IAdaptable e : elements) {
IProject p = (IProject) e.getAdapter(IProject.class);
if (p != null) {
- projects.add(p);
+ projects.add(p);
}
}
}
@@ -311,5 +179,209 @@
projects.toArray(array);
return array;
}
-
+
+ class GetProfilesJob extends Job {
+
+ private IProfileManager profileManager;
+ private Set<IMavenProjectFacade> facades;
+ private Map<IMavenProjectFacade, List<ProfileStatus>> allProfiles;
+ private List<ProfileSelection> sharedProfiles;
+
+ private GetProfilesJob(final Set<IMavenProjectFacade> facades, IProfileManager profileManager) {
+ super("get profiles");
+ this.facades = facades;
+ this.profileManager = profileManager;
+ }
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ this.allProfiles = getAllProfiles(facades, profileManager);
+ this.sharedProfiles = getSharedProfiles(allProfiles);
+ } catch (CoreException e) {
+ return new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+ Messages.ProfileSelectionHandler_Unable_to_open_profile_dialog, e);
+ }
+ return Status.OK_STATUS;
+ }
+
+ private List<ProfileSelection> getSharedProfiles(
+ Map<IMavenProjectFacade, List<ProfileStatus>> projectProfilesMap) {
+
+ List<ProfileStatus> currentSelection = null;
+ List<List<ProfileStatus>> projectProfiles = new ArrayList<List<ProfileStatus>>(projectProfilesMap.values());
+ int smallestSize = Integer.MAX_VALUE;
+ for (List<ProfileStatus> profiles : projectProfiles) {
+ int size = profiles.size();
+ if (size < smallestSize) {
+ smallestSize = size;
+ currentSelection = profiles;
+ }
+ }
+ projectProfiles.remove(currentSelection);
+
+ // Init the smallest profiles selection possible
+ List<ProfileSelection> selection = new ArrayList<ProfileSelection>();
+ for (ProfileStatus p : currentSelection) {
+ ProfileSelection ps = new ProfileSelection();
+ ps.setId(p.getId());
+ ps.setActivationState(p.getActivationState());
+ ps.setAutoActive(p.isAutoActive());
+ ps.setSource(p.getSource());
+ ps.setSelected(p.isUserSelected());
+ selection.add(ps);
+ }
+
+ if (!projectProfiles.isEmpty()) {
+ // Restrict to the common profiles only
+ Iterator<ProfileSelection> ite = selection.iterator();
+
+ while (ite.hasNext()) {
+ ProfileSelection p = ite.next();
+ for (List<ProfileStatus> statuses : projectProfiles) {
+ ProfileStatus s = hasProfile(p.getId(), statuses);
+ if (s == null) {
+ // remove any non-common profile selection
+ ite.remove();
+ break;
+ }
+ // reset non common settings
+ if (p.getAutoActive() != null && !p.getAutoActive().equals(s.isAutoActive())) {
+ p.setAutoActive(null);
+ }
+ if (p.getSource() != null && !p.getSource().equals(s.getSource())) {
+ p.setSource(null);
+ }
+ if (p.getSelected() != null && !p.getSelected().equals(s.isUserSelected())) {
+ p.setSelected(null);
+ }
+ if (p.getActivationState() != null && !p.getActivationState().equals(s.getActivationState())) {
+ p.setActivationState(null);
+ p.setAutoActive(null);
+ }
+ }
+ }
+ }
+
+ return selection;
+ }
+
+ private ProfileStatus hasProfile(String id, List<ProfileStatus> statuses) {
+ for (ProfileStatus p : statuses) {
+ if (id.equals(p.getId())) {
+ return p;
+ }
+ }
+ return null;
+ }
+
+ private Map<IMavenProjectFacade, List<ProfileStatus>> getAllProfiles(final Set<IMavenProjectFacade> facades,
+ final IProfileManager profileManager) throws CoreException {
+ Map<IMavenProjectFacade, List<ProfileStatus>> allProfiles =
+ new HashMap<IMavenProjectFacade, List<ProfileStatus>>(facades.size());
+ IProgressMonitor monitor = new NullProgressMonitor();
+ for (IMavenProjectFacade facade : facades) {
+ allProfiles.put(facade, profileManager.getProfilesStatuses(facade, monitor));
+ }
+ return allProfiles;
+ }
+
+ public List<ProfileSelection> getSharedProfiles() {
+ return sharedProfiles;
+ }
+
+ public Map<IMavenProjectFacade, List<ProfileStatus>> getAllProfiles() {
+ return allProfiles;
+ }
+ }
+
+ class UpdateProfilesJob extends WorkspaceJob {
+
+ private Map<IMavenProjectFacade, List<ProfileStatus>> allProfiles;
+ private List<ProfileSelection> sharedProfiles;
+ private IProfileManager profileManager;
+ private SelectProfilesDialog dialog;
+
+ private UpdateProfilesJob(Map<IMavenProjectFacade, List<ProfileStatus>> allProfiles,
+ List<ProfileSelection> sharedProfiles, IProfileManager profileManager, SelectProfilesDialog dialog) {
+ super(Messages.ProfileManager_Updating_maven_profiles);
+ this.allProfiles = allProfiles;
+ this.sharedProfiles = sharedProfiles;
+ this.profileManager = profileManager;
+ this.dialog = dialog;
+ }
+
+ public IStatus runInWorkspace(IProgressMonitor monitor) {
+ try {
+ SubMonitor progress = SubMonitor.convert(monitor, Messages.ProfileManager_Updating_maven_profiles, 100);
+ SubMonitor subProgress = SubMonitor.convert(progress.newChild(5), allProfiles.size() * 100);
+ for (Map.Entry<IMavenProjectFacade, List<ProfileStatus>> entry : allProfiles.entrySet()) {
+ if (progress.isCanceled()) {
+ throw new OperationCanceledException();
+ }
+ IMavenProjectFacade facade = entry.getKey();
+ List<String> activeProfiles = getActiveProfiles(sharedProfiles, entry.getValue());
+
+ profileManager.updateActiveProfiles(facade, activeProfiles,
+ dialog.isOffline(), dialog.isForceUpdate(), subProgress.newChild(100));
+ }
+ } catch (CoreException ex) {
+ Activator.log(ex);
+ return ex.getStatus();
+ }
+ return Status.OK_STATUS;
+ }
+
+ private List<String> getActiveProfiles(
+ List<ProfileSelection> sharedProfiles,
+ List<ProfileStatus> availableProfiles) {
+ List<String> ids = new ArrayList<String>();
+
+ for (ProfileStatus st : availableProfiles) {
+ ProfileSelection selection = findSelectedProfile(st.getId(), sharedProfiles);
+ String id = null;
+ boolean isDisabled = false;
+ if (selection == null) {
+ // was not displayed. Use existing value.
+ if (st.isUserSelected()) {
+ id = st.getId();
+ isDisabled = st.getActivationState().equals(ProfileState.Disabled);
+ }
+ } else {
+ if (null == selection.getSelected()) {
+ // Value was displayed but its state is unknown, use
+ // previous state
+ if (st.isUserSelected()) {
+ id = st.getId();
+ isDisabled = st.getActivationState().equals(ProfileState.Disabled);
+ }
+ } else {
+ // Value was displayed and is consistent
+ if (Boolean.TRUE.equals(selection.getSelected())) {
+ id = selection.getId();
+ isDisabled = selection.getActivationState().equals(ProfileState.Disabled);
+ }
+ }
+ }
+
+ if (id != null) {
+ if (isDisabled) {
+ id = "!" + id; //$NON-NLS-1$
+ }
+ ids.add(id);
+ }
+ }
+ return ids;
+ }
+
+ private ProfileSelection findSelectedProfile(String id,
+ List<ProfileSelection> sharedProfiles) {
+ for (ProfileSelection sel : sharedProfiles) {
+ if (id.equals(sel.getId())) {
+ return sel;
+ }
+ }
+ return null;
+ }
+ }
}
14 years, 8 months
JBoss Tools SVN: r33677 - in trunk/maven/plugins: org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-08 10:24:08 -0400 (Mon, 08 Aug 2011)
New Revision: 33677
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/profiles/ProfileManager.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java
Log:
JBIDE-8969 Added support for right-click on multiple profile selection
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/profiles/ProfileManager.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/profiles/ProfileManager.java 2011-08-08 13:15:11 UTC (rev 33676)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/profiles/ProfileManager.java 2011-08-08 14:24:08 UTC (rev 33677)
@@ -37,6 +37,8 @@
public class ProfileManager implements IProfileManager {
+ private static final String ARTIFACT_SEPARATOR = ":"; //$NON-NLS-1$
+
public void updateActiveProfiles(final IMavenProjectFacade mavenProjectFacade,
final List<String> profiles,
final boolean isOffline,
@@ -183,18 +185,21 @@
private String findSource(Profile profile, List<Model> modelHierarchy) {
if (profile != null) {
- if ("settings.xml".equals(profile.getSource())) {
+ if ("settings.xml".equals(profile.getSource())) { //$NON-NLS-1$
return profile.getSource();
}
for (Model m : modelHierarchy) {
for (Profile p : m.getProfiles()) {
if(p.equals(profile)) {
- return m.getArtifactId();
+ return //m.getGroupId()+ARTIFACT_SEPARATOR+
+ m.getArtifactId()
+ //+ (m.getVersion()==null?"":ARTIFACT_SEPARATOR+m.getVersion())//$NON-NLS-1$
+ ;
}
}
}
}
- return "undefined";
+ return "undefined"; //$NON-NLS-1$
}
protected List<Profile> collectAvailableProfiles(List<Model> models, IProgressMonitor monitor) throws CoreException {
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java 2011-08-08 13:15:11 UTC (rev 33676)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java 2011-08-08 14:24:08 UTC (rev 33677)
@@ -299,13 +299,7 @@
ISelection s = profileTableViewer.getSelection();
if (s instanceof IStructuredSelection) {
IStructuredSelection sel = (IStructuredSelection) s;
- Iterator<?> ite = sel.iterator();
- while (ite.hasNext()) {
- Object o = ite.next();
- if (o instanceof ProfileSelection) {
- setActivationState((ProfileSelection)o, state);
- }
- }
+ setActivationState(sel, state);
}
refresh();
}
@@ -360,17 +354,26 @@
IStructuredSelection selection = (IStructuredSelection) profileTableViewer
.getSelection();
if (!selection.isEmpty()) {
- final ProfileSelection entry = (ProfileSelection) selection.getFirstElement();
- String text = ""; //$NON-NLS-1$
- ProfileState state = entry.getActivationState();
- if ( state == null || state.equals(ProfileState.Disabled)) {
+ boolean multiSelection = selection.size() > 1;
+ ProfileState state = null;
+ String selectionText;
+ String text;
+ if (multiSelection) {
+ selectionText = "selected profiles";
+ } else {
+ ProfileSelection entry = (ProfileSelection) selection.getFirstElement();
+ state = entry.getActivationState();
+ selectionText = entry.getId();
+ }
+
+ if ( state == null || ProfileState.Disabled.equals(state)) {
text = Messages.SelectProfilesDialog_Activate_menu;
- activationAction.setText(NLS.bind(text, entry.getId()));
+ activationAction.setText(NLS.bind(text, selectionText));
manager.add(activationAction);
}
if( !ProfileState.Disabled.equals(state)) {
text = Messages.SelectProfilesDialog_Deactivate_menu;
- deActivationAction.setText(NLS.bind(text, entry.getId()));
+ deActivationAction.setText(NLS.bind(text, selectionText));
manager.add(deActivationAction);
}
}
@@ -497,12 +500,20 @@
}
*/
- private void setActivationState(final ProfileSelection profileSelection, ProfileState state) {
- profileSelection.setActivationState(state);
- profileTableViewer.setChecked(profileSelection, true);
- profileTableViewer.setGrayed(profileSelection, false);
- if (ProfileState.Disabled.equals(state)) {
- profileSelection.setSelected(true);
+ private void setActivationState(final IStructuredSelection sel, ProfileState state) {
+ if (sel == null) return;
+ Iterator<?> ite = sel.iterator();
+ while (ite.hasNext()) {
+ Object o = ite.next();
+ if (o instanceof ProfileSelection) {
+ ProfileSelection ps = (ProfileSelection) o;
+ ps.setActivationState(state);
+ profileTableViewer.setGrayed(ps, false);
+ if (ProfileState.Disabled.equals(state)) {
+ profileTableViewer.setChecked(ps, true);
+ ps.setSelected(true);
+ }
+ }
}
}
@@ -526,8 +537,7 @@
IStructuredSelection selection = (IStructuredSelection) profileTableViewer
.getSelection();
if (!selection.isEmpty()) {
- final ProfileSelection entry = (ProfileSelection) selection.getFirstElement();
- setActivationState(entry, state);
+ setActivationState(selection, state);
refresh();
}
super.run();
14 years, 8 months
JBoss Tools SVN: r33676 - in trunk/maven/plugins: org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-08 09:15:11 -0400 (Mon, 08 Aug 2011)
New Revision: 33676
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/profiles/ProfileManager.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java
Log:
JBIDE-9403 Add Activate/Deactive button to maven profile selection
JBIDE-8969 Add profiles from parent hierarchy to the list of available profiles
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/profiles/ProfileManager.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/profiles/ProfileManager.java 2011-08-08 11:53:10 UTC (rev 33675)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/profiles/ProfileManager.java 2011-08-08 13:15:11 UTC (rev 33676)
@@ -19,6 +19,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.SettingsUtils;
+import org.codehaus.plexus.util.StringUtils;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -126,8 +127,12 @@
MavenProject mavenProject = facade.getMavenProject(monitor);
- List<Profile> projectProfiles = getAvailableProfiles(mavenProject.getModel(), new NullProgressMonitor());
+
+ List<Model> modelHierarchy = new ArrayList<Model>();
+ getModelHierarchy(modelHierarchy, mavenProject.getModel(), new NullProgressMonitor());
+ List<Profile> availableProfiles = collectAvailableProfiles(modelHierarchy, new NullProgressMonitor());
+
final Map<Profile, Boolean> availableSettingsProfiles = getAvailableSettingProfiles();
Set<Profile> settingsProfiles = new HashSet<Profile>(availableSettingsProfiles.keySet());
@@ -135,7 +140,7 @@
//First we put user configured profiles
for (String pId : configuredProfiles) {
- if ("".equals(pId.trim())) continue;
+ if (StringUtils.isEmpty(pId)) continue;
boolean isDisabled = pId.startsWith("!");
String id = (isDisabled)?pId.substring(1):pId;
ProfileStatus status = new ProfileStatus(id);
@@ -144,7 +149,8 @@
:ProfileState.Active;
status.setActivationState(state);
- Profile p = get(id, projectProfiles);
+ Profile p = get(id, availableProfiles);
+
if (p == null){
p = get(id, settingsProfiles);
if(p != null){
@@ -152,17 +158,13 @@
}
}
- if (p == null) {
- status.setSource("undefined");
- } else {
- status.setSource(p.getSource());
- }
+ status.setSource(findSource(p, modelHierarchy));
statuses.add(status);
}
final List<Profile> activeProfiles = mavenProject.getActiveProfiles();
//Iterate on the remaining project profiles
- addStatuses(statuses, projectProfiles, new ActivationPredicate() {
+ addStatuses(statuses, availableProfiles, modelHierarchy, new ActivationPredicate() {
@Override
boolean isActive(Profile p) {
return ProfileManager.this.isActive(p, activeProfiles);
@@ -170,7 +172,7 @@
});
//Iterate on the remaining settings profiles
- addStatuses(statuses, settingsProfiles, new ActivationPredicate() {
+ addStatuses(statuses, settingsProfiles, modelHierarchy, new ActivationPredicate() {
@Override
boolean isActive(Profile p) {
return availableSettingsProfiles.get(p);
@@ -179,24 +181,45 @@
return Collections.unmodifiableList(statuses);
}
- protected List<Profile> getAvailableProfiles(Model projectModel, IProgressMonitor monitor) throws CoreException {
+ private String findSource(Profile profile, List<Model> modelHierarchy) {
+ if (profile != null) {
+ if ("settings.xml".equals(profile.getSource())) {
+ return profile.getSource();
+ }
+ for (Model m : modelHierarchy) {
+ for (Profile p : m.getProfiles()) {
+ if(p.equals(profile)) {
+ return m.getArtifactId();
+ }
+ }
+ }
+ }
+ return "undefined";
+ }
+
+ protected List<Profile> collectAvailableProfiles(List<Model> models, IProgressMonitor monitor) throws CoreException {
+ List<Profile> profiles = new ArrayList<Profile>();
+ for (Model m : models) {
+ profiles.addAll(m.getProfiles());
+ }
+ return profiles;
+ }
+
+ protected List<Model> getModelHierarchy(List<Model> models, Model projectModel, IProgressMonitor monitor) throws CoreException {
if (projectModel == null) {
return null;
}
- List<Profile> profiles = new ArrayList<Profile>(projectModel.getProfiles());
-
+ models.add(projectModel);
Parent p = projectModel.getParent();
if (p != null) {
Model parentModel = resolvePomModel(p.getGroupId(), p.getArtifactId(), p.getVersion(), monitor);
- List<Profile> parentProfiles = getAvailableProfiles(parentModel, monitor);
- if (parentProfiles != null && !parentProfiles.isEmpty()) {
- profiles.addAll(parentProfiles);
+ if (parentModel != null) {
+ getModelHierarchy(models, parentModel, monitor);
}
}
-
- return profiles;
+ return models;
}
-
+
private Model resolvePomModel(String groupId, String artifactId, String version, IProgressMonitor monitor)
throws CoreException {
monitor.subTask(NLS.bind("Resolving {0}:{1}:{2}", new Object[] { groupId, artifactId, version}));
@@ -218,10 +241,10 @@
return maven.readModel(file);
}
- private void addStatuses(List<ProfileStatus> statuses, Collection<Profile> profiles, ActivationPredicate predicate) {
+ private void addStatuses(List<ProfileStatus> statuses, Collection<Profile> profiles, List<Model> modelHierarchy, ActivationPredicate predicate) {
for (Profile p : profiles) {
ProfileStatus status = new ProfileStatus(p.getId());
- status.setSource(p.getSource());
+ status.setSource(findSource(p, modelHierarchy));
boolean isActive = predicate.isActive(p);
ProfileState activationState = (isActive)?ProfileState.Active:ProfileState.Inactive;
status.setAutoActive(isActive);
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java 2011-08-08 11:53:10 UTC (rev 33675)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java 2011-08-08 13:15:11 UTC (rev 33676)
@@ -188,7 +188,7 @@
gd.heightHint = 200;
gd.widthHint = 500;
- profileTableViewer = CheckboxTableViewer.newCheckList(container, SWT.BORDER);
+ profileTableViewer = CheckboxTableViewer.newCheckList(container, SWT.BORDER | SWT.MULTI);
Table table = profileTableViewer.getTable();
table.setFocus();
table.setLayoutData(gd);
14 years, 8 months