October 2012 - jbosstools-commits

JBoss Tools SVN: r44380 - trunk/build/parent.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-09 10:41:00 -0400 (Tue, 09 Oct 2012) New Revision: 44380 Modified: trunk/build/parent/pom.xml Log: Clean pluginRepositories Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-10-09 14:37:22 UTC (rev 44379) +++ trunk/build/parent/pom.xml 2012-10-09 14:41:00 UTC (rev 44380) @@ -772,28 +772,17 @@ </repository> </repositories> -  +  +  <pluginRepositories> <pluginRepository> <id>sonatype-public-grid</id> - <name>sonatype-public-grid</name> <url>https://repository.sonatype.org/content/groups/sonatype-public-grid</url> </pluginRepository> <pluginRepository> <id>sonatype-public-repository</id> <url>https://oss.sonatype.org/content/groups/public</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> </pluginRepository> - <pluginRepository> - <id>repository.sonatype.org-snapshots</id> - <name>repository.sonatype.org-snapshots</name> - <url>https://repository.sonatype.org/content/repositories/snapshots</url> - </pluginRepository> </pluginRepositories>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44379 - in trunk/build: parent and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-09 10:37:22 -0400 (Tue, 09 Oct 2012) New Revision: 44379 Removed: trunk/build/emma/ Modified: trunk/build/parent/pom.xml Log: Remove emma-related stuff. Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-10-09 14:25:07 UTC (rev 44378) +++ trunk/build/parent/pom.xml 2012-10-09 14:37:22 UTC (rev 44379) @@ -724,143 +724,6 @@ </profile> <profile> - <id>coverage</id> - <activation> - <property> - <name>coverage</name> - </property> - </activation> - <properties> - <emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file> - <emma.instrument.bundles /> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tychoVersion}</version> - <configuration> - <systemProperties combine.children="append"> - <emma.session.out.file>${emma.session.out.file}</emma.session.out.file> - <emma.filter>${coverage.filter}</emma.filter> - <eclemma.instrument.bundles>${emma.instrument.bundles}</eclemma.instrument.bundles> - </systemProperties> - <frameworkExtensions> - <frameworkExtension> - <groupId>org.eclemma.runtime.equinox</groupId> - <artifactId>org.eclemma.runtime.equinox</artifactId> - <version>1.1.0.200908261008</version> - </frameworkExtension> - </frameworkExtensions> - <application>org.eclipse.ui.ide.workbench</application> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.platform.ide</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>${maven.antrun.plugin.version}</version> - <dependencies> - <dependency> - <groupId>emma</groupId> - <artifactId>emma_ant</artifactId> - <version>2.0.5312</version> - </dependency> - <dependency> - <groupId>emma</groupId> - <artifactId>emma</artifactId> - <version>2.0.5312</version> - </dependency> - <dependency> - <groupId>ant-contrib</groupId> - <artifactId>ant-contrib</artifactId> - <version>1.0b3</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <executions> - <execution> - <id>emma-report</id> - <phase>post-integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <taskdef resource="emma_ant.properties" /> - <taskdef resource="net/sf/antcontrib/antlib.xml" /> - <if> - <available file="${project.build.directory}/emma" - type="dir" /> - <then> - <echo>Process emma report...</echo> - <for list="${emma.instrument.bundles}" param="bundle"> - <sequential> - <property name="@{bundle}-classes" - location="${project.build.directory}/../../../plugins/@{bundle}" /> - <if> - <available file="${@{bundle}-classes}" type="dir" /> - <then> - <echo>Generating coverage metadata for ${@{bundle}-classes}</echo> - <emma enabled="true"> - <instr metadatafile="${project.build.directory}/emma/(a){bundle}-coverage.em" - mode="copy" outdir="${project.build.directory}/instrumented-classes/@{bundle}"> - <instrpath> - <dirset dir="${@{bundle}-classes}"> - <include name="target/*classes"/> - </dirset> - </instrpath> - </instr> - </emma> - </then> - <else> - <echo>Skipping coverage metadata generation for ${@{bundle}-classes}</echo> - </else> - </if> - </sequential> - </for> - <emma enabled="true"> - <report> - <infileset dir="${project.build.directory}/emma" - includes="*.es,*.em" /> - <txt outfile="${project.build.directory}/emma/coverage.txt" /> - <xml outfile="${project.build.directory}/emma/coverage.xml" /> - <html outfile="${project.build.directory}/emma/coverage.html" /> - </report> - </emma> - <if> - <available file="${project.build.directory}/emma/coverage.txt" type="file" /> - <then> - <loadfile property="emma.txt" srcFile="${project.build.directory}/emma/coverage.txt" failonerror="false" /> - <echo>${emma.txt}</echo> - </then> - <else> - <echo>No coverage report found </echo> - </else> - </if> - </then> - </if> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>default</id> <activation> <activeByDefault>true</activeByDefault>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44378 - in trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooling: 3.3.1.ER3 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: gvarsami Date: 2012-10-09 10:25:07 -0400 (Tue, 09 Oct 2012) New Revision: 44378 Added: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... Removed: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... Log: updated to ER3 Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... =================================================================== --- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-09 09:57:48 UTC (rev 44373) +++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-09 14:25:07 UTC (rev 44378) @@ -14,7 +14,7 @@  <child location='../../../../staging/soatools-3.3.0_GA.component--bpel/all/repo/'/> -<child location='../../../../staging/soatools-3.3.1_ER1.component--droolsjbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.1_ER3.component--droolsjbpm/all/repo/'/> <child location='../../../../staging/soatools-3.3.0_GA.component--esb/all/repo/'/> <child location='../../../../staging/soatools-3.3.0_GA.component--flow/all/repo/'/> <child location='../../../../staging/soatools-3.3.0_GA.component--jbpm/all/repo/'/> Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... =================================================================== --- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-09 09:57:48 UTC (rev 44373) +++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-09 14:25:07 UTC (rev 44378) @@ -14,7 +14,7 @@  <child location='../../../../staging/soatools-3.3.0_GA.component--bpel/all/repo/'/> -<child location='../../../../staging/soatools-3.3.1_ER1.component--droolsjbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.1_ER3.component--droolsjbpm/all/repo/'/> <child location='../../../../staging/soatools-3.3.0_GA.component--esb/all/repo/'/> <child location='../../../../staging/soatools-3.3.0_GA.component--flow/all/repo/'/> <child location='../../../../staging/soatools-3.3.0_GA.component--jbpm/all/repo/'/>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44377 - in trunk/documentation/whatsnew: examples and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2012-10-09 09:49:23 -0400 (Tue, 09 Oct 2012) New Revision: 44377 Added: trunk/documentation/whatsnew/forge/forge-news-4.0.0.Alpha2.html trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/ trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/about.png trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/debug-exec.png trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/debug-pref.png trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/debug-source.png Modified: trunk/documentation/whatsnew/examples/examples-news-4.0.0.Alpha2.html trunk/documentation/whatsnew/index.html Log: JBIDE-12687: Forge Tools N&N Modified: trunk/documentation/whatsnew/examples/examples-news-4.0.0.Alpha2.html =================================================================== --- trunk/documentation/whatsnew/examples/examples-news-4.0.0.Alpha2.html 2012-10-09 13:47:21 UTC (rev 44376) +++ trunk/documentation/whatsnew/examples/examples-news-4.0.0.Alpha2.html 2012-10-09 13:49:23 UTC (rev 44377) @@ -23,7 +23,8 @@ <body> <h1>Examples 4.0.0.Alpha2 What's New</h1> <p align="right"><a -href="../vpe/vpe-news-4.0.0.Alpha2.html">< Visual Editor</a> <a href="../index.html"> Main Index ></a> +href="../vpe/vpe-news-4.0.0.Alpha2.html">< Visual Editor</a> <a + href="../forge/forge-news-4.0.0.Alpha2.html">Forge Tools ></a> </p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> Added: trunk/documentation/whatsnew/forge/forge-news-4.0.0.Alpha2.html =================================================================== --- trunk/documentation/whatsnew/forge/forge-news-4.0.0.Alpha2.html (rev 0) +++ trunk/documentation/whatsnew/forge/forge-news-4.0.0.Alpha2.html 2012-10-09 13:49:23 UTC (rev 44377) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>Forge Tools 4.0.0.Alpha2 What's New</title> +<script type="text/javascript"> + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-17645367-5']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + +</script></head> +<body> +<h1>Forge Tools 4.0.0.Alpha2 What's New</h1> + + <p align="right"> + <a href="../examples/examples-news-4.0.0.Alpha2.html"> < Project Examples</a> + <a href="../index.html">Main Index ></a></p> + + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>New Embedded Forge Runtime</b></td> + <td valign="top"> + <p>The embedded runtime is now Forge 1.0.6.Final!</p> + <p align="center"><img src="images/4.0.0.Alpha2/about.png" /></p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Launch Forge in Debug Mode</b></td> + <td valign="top"> + <p>A new toggle allows the users to start Forge in debug mode.</p> + <p align="center"><img src="images/4.0.0.Alpha2/debug-pref.png"/></p> + <p>This feature is especially useful for developers that are working on new Forge plugin projects. + Now it is possible to install and execute these plugins and debug them from within JBoss Tools. </p> + <p align="center"><img src="images/4.0.0.Alpha2/debug-exec.png"/></p> + <p>A number of improvements for this feature is already on the wishlist though. + Currently the source lookup path has to be respecified at every Forge startup. As shown below, this + is usually only a matter of adding the projects in the current workspace.</p> + <p align="center"><img src="images/4.0.0.Alpha2/debug-source.png"/></p> + <p>An obvious improvement would consequently be to save this source lookup path between Forge launches. + Another improvements would be hot code replacement to make the turnaround time shorter.</p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> +</table> + +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/forge/forge-news-4.0.0.Alpha2.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/about.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/about.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/debug-exec.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/debug-exec.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/debug-pref.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/debug-pref.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/debug-source.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/forge/images/4.0.0.Alpha2/debug-source.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/documentation/whatsnew/index.html =================================================================== --- trunk/documentation/whatsnew/index.html 2012-10-09 13:47:21 UTC (rev 44376) +++ trunk/documentation/whatsnew/index.html 2012-10-09 13:49:23 UTC (rev 44377) @@ -57,6 +57,7 @@ <p><a href="usage/usage-news-4.0.0.Alpha2.html">Usage</a></p> <p><a href="vpe/vpe-news-4.0.0.Alpha2.html">Visual Page Editor/BrowserSim</a></p> <p><a href="examples/examples-news-4.0.0.Alpha2.html">Project Examples</a></p> + <p><a href="forge/forge-news-4.0.0.Alpha2.html">Forge Tools</a></p> </td> </tr> <tr>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44376 - in trunk/build/target-platforms: jbdevstudio-JunoSR0b/local and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-09 09:47:21 -0400 (Tue, 09 Oct 2012) New Revision: 44376 Removed: trunk/build/target-platforms/scripts/ Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml Log: Use a Mojo instead of scripts to mirror target platform. Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-09 13:20:18 UTC (rev 44375) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-09 13:47:21 UTC (rev 44376) @@ -14,10 +14,6 @@ <properties> <repoDir>${project.build.directory}/REPO</repoDir> - <eclipse.type>platform</eclipse.type> - - <eclipse.version>4.2</eclipse.version> - <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl...</eclipse.URL>   <tychoVersion>0.16.0-SNAPSHOT</tychoVersion> @@ -27,6 +23,14 @@ <build> <plugins> <plugin> +  + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tychoVersion}</version> + <extensions>true</extensions> + </plugin> + + <plugin> <groupId>org.jboss.tools.tycho-plugins</groupId> <artifactId>target-platform-utils</artifactId> <version>0.0.1-SNAPSHOT</version> @@ -95,82 +99,39 @@ <profiles> <profile> - <id>get.local.target</id> + <id>multiple2repo</id> <activation> <activeByDefault>true</activeByDefault> </activation> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> +  + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple</id> + <phase>package</phase> <goals> - <goal>get</goal> + <goal>mirror-target-to-repo</goal> </goals> - <phase>package</phase> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <packaging>target</packaging> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <outputRepository>${repoDir}</outputRepository> </configuration> </execution> </executions> </plugin> - <plugin> -  - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <phase>package</phase> - <configuration> - <tasks> -  - <ant antfile="../../scripts/build.xml"> -  - <property name="targetFile" value="${project.build.directory}/multiple.target" /> - <property name="eclipse.version" value="${eclipse.version}" /> - <property name="eclipse.type" value="${eclipse.type}" /> - <property name="eclipse.URL" value="${eclipse.URL}"/> - <property name="repoDir" value="${repoDir}"/> -  - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-commons-net</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> </profile> </profiles> </project> + +</project> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-09 13:20:18 UTC (rev 44375) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-09 13:47:21 UTC (rev 44376) @@ -14,10 +14,6 @@ <properties> <repoDir>${project.build.directory}/REPO</repoDir> - <eclipse.type>platform</eclipse.type> - - <eclipse.version>4.2.1</eclipse.version> - <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl...</eclipse.URL>   <tychoVersion>0.16.0-SNAPSHOT</tychoVersion> @@ -27,6 +23,14 @@ <build> <plugins> <plugin> +  + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tychoVersion}</version> + <extensions>true</extensions> + </plugin> + + <plugin> <groupId>org.jboss.tools.tycho-plugins</groupId> <artifactId>target-platform-utils</artifactId> <version>0.0.1-SNAPSHOT</version> @@ -95,82 +99,40 @@ <profiles> <profile> - <id>get.local.target</id> + <id>multiple2repo</id> <activation> <activeByDefault>true</activeByDefault> </activation> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> +  + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple</id> + <phase>package</phase> <goals> - <goal>get</goal> + <goal>mirror-target-to-repo</goal> </goals> - <phase>package</phase> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <packaging>target</packaging> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <outputRepository>${repoDir}</outputRepository> </configuration> </execution> </executions> </plugin> - <plugin> -  - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <phase>package</phase> - <configuration> - <tasks> -  - <ant antfile="../../scripts/build.xml"> -  - <property name="targetFile" value="${project.build.directory}/multiple.target" /> - <property name="eclipse.version" value="${eclipse.version}" /> - <property name="eclipse.type" value="${eclipse.type}" /> - <property name="eclipse.URL" value="${eclipse.URL}"/> - <property name="repoDir" value="${repoDir}"/> -  - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-commons-net</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> </profile> </profiles> </project> + + +</project> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-09 13:20:18 UTC (rev 44375) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-09 13:47:21 UTC (rev 44376) @@ -14,10 +14,6 @@ <properties> <repoDir>${project.build.directory}/REPO</repoDir> - <eclipse.type>platform</eclipse.type> - - <eclipse.version>4.2</eclipse.version> - <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl...</eclipse.URL>   <tychoVersion>0.16.0-SNAPSHOT</tychoVersion> @@ -27,6 +23,14 @@ <build> <plugins> <plugin> +  + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tychoVersion}</version> + <extensions>true</extensions> + </plugin> + + <plugin> <groupId>org.jboss.tools.tycho-plugins</groupId> <artifactId>target-platform-utils</artifactId> <version>0.0.1-SNAPSHOT</version> @@ -95,79 +99,34 @@ <profiles> <profile> - <id>get.local.target</id> + <id>multiple2repo</id> <activation> <activeByDefault>true</activeByDefault> </activation> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> +  + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple</id> + <phase>package</phase> <goals> - <goal>get</goal> + <goal>mirror-target-to-repo</goal> </goals> - <phase>package</phase> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <packaging>target</packaging> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <outputRepository>${repoDir}</outputRepository> </configuration> </execution> </executions> </plugin> - <plugin> -  - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <phase>package</phase> - <configuration> - <tasks> -  - <ant antfile="../../scripts/build.xml"> -  - <property name="targetFile" value="${project.build.directory}/multiple.target" /> - <property name="eclipse.version" value="${eclipse.version}" /> - <property name="eclipse.type" value="${eclipse.type}" /> - <property name="eclipse.URL" value="${eclipse.URL}"/> - <property name="repoDir" value="${repoDir}"/> -  - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-commons-net</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> </profile> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-09 13:20:18 UTC (rev 44375) +++ trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-09 13:47:21 UTC (rev 44376) @@ -14,10 +14,6 @@ <properties> <repoDir>${project.build.directory}/REPO</repoDir> - <eclipse.type>platform</eclipse.type> - - <eclipse.version>4.2.1</eclipse.version> - <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl...</eclipse.URL>   <tychoVersion>0.16.0-SNAPSHOT</tychoVersion> @@ -27,6 +23,14 @@ <build> <plugins> <plugin> +  + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tychoVersion}</version> + <extensions>true</extensions> + </plugin> + + <plugin> <groupId>org.jboss.tools.tycho-plugins</groupId> <artifactId>target-platform-utils</artifactId> <version>0.0.1-SNAPSHOT</version> @@ -95,82 +99,40 @@ <profiles> <profile> - <id>get.local.target</id> + <id>multiple2repo</id> <activation> <activeByDefault>true</activeByDefault> </activation> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> +  + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple</id> + <phase>package</phase> <goals> - <goal>get</goal> + <goal>mirror-target-to-repo</goal> </goals> - <phase>package</phase> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <packaging>target</packaging> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <outputRepository>${repoDir}</outputRepository> </configuration> </execution> </executions> </plugin> - <plugin> -  - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <phase>package</phase> - <configuration> - <tasks> -  - <ant antfile="../../scripts/build.xml"> -  - <property name="targetFile" value="${project.build.directory}/multiple.target" /> - <property name="eclipse.version" value="${eclipse.version}" /> - <property name="eclipse.type" value="${eclipse.type}" /> - <property name="eclipse.URL" value="${eclipse.URL}"/> - <property name="repoDir" value="${repoDir}"/> -  - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-commons-net</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> </profile> </profiles> </project> + + +</project>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44375 - trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-09 09:20:18 -0400 (Tue, 09 Oct 2012) New Revision: 44375 Modified: trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/FlattenTargetMojo.java trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/MergeTargetsMojo.java trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetArtifact.java trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetToRepoMojo.java Log: Fix and factorization in TP-related Mojos Modified: trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/FlattenTargetMojo.java =================================================================== --- trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/FlattenTargetMojo.java 2012-10-09 12:32:55 UTC (rev 44374) +++ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/FlattenTargetMojo.java 2012-10-09 13:20:18 UTC (rev 44375) @@ -92,23 +92,7 @@ } if (this.sourceTargetArtifact != null) { - if (!this.sourceTargetArtifact.isCorrectlySet()) { - throw new MojoExecutionException("'sourceTargetArtifact' must define groupId, artifactId and version"); - } - getLog().debug("Downloading " + sourceTargetArtifact.toString()); - Artifact artifact = this.repositorySystem.createArtifactWithClassifier(this.sourceTargetArtifact.getGroupId(), this.sourceTargetArtifact.getArtifactId(), this.sourceTargetArtifact.getVersion(), "target", - this.sourceTargetArtifact.getArtifactId()); - ArtifactResolutionRequest request = new ArtifactResolutionRequest(); - request.setArtifact(artifact); - request.setLocalRepository(this.session.getLocalRepository()); - request.setRemoteRepositories(this.project.getRemoteArtifactRepositories()); - this.repositorySystem.resolve(request); - - if (!artifact.isResolved()) { - throw new RuntimeException("Could not resolve target platform specification artifact " + artifact); - } - - this.sourceTargetFile = artifact.getFile(); + this.sourceTargetFile = this.sourceTargetArtifact.getFile(this.repositorySystem, this.session, this.project); } try { Modified: trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/MergeTargetsMojo.java =================================================================== --- trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/MergeTargetsMojo.java 2012-10-09 12:32:55 UTC (rev 44374) +++ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/MergeTargetsMojo.java 2012-10-09 13:20:18 UTC (rev 44375) @@ -77,24 +77,8 @@ } if (this.sourceTargetArtifacts != null) { - for (TargetArtifact sourceTargetArtifact : sourceTargetArtifacts) { - if (!sourceTargetArtifact.isCorrectlySet()) { - throw new MojoExecutionException("'sourceTargetArtifact' must define groupId, artifactId and version"); - } - getLog().debug("Downloading " + sourceTargetArtifact.toString()); - Artifact artifact = this.repositorySystem.createArtifactWithClassifier(sourceTargetArtifact.getGroupId(), sourceTargetArtifact.getArtifactId(), sourceTargetArtifact.getVersion(), "target", - sourceTargetArtifact.getArtifactId()); - ArtifactResolutionRequest request = new ArtifactResolutionRequest(); - request.setArtifact(artifact); - request.setLocalRepository(this.session.getLocalRepository()); - request.setRemoteRepositories(this.project.getRemoteArtifactRepositories()); - this.repositorySystem.resolve(request); - - if (!artifact.isResolved()) { - throw new RuntimeException("Could not resolve target platform specification artifact " + artifact); - } - - this.sourceTargetFiles.add(artifact.getFile()); + for (TargetArtifact sourceTargetArtifact : this.sourceTargetArtifacts) { + this.sourceTargetFiles.add(sourceTargetArtifact.getFile(this.repositorySystem, this.session, this.project)); } } Modified: trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetArtifact.java =================================================================== --- trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetArtifact.java 2012-10-09 12:32:55 UTC (rev 44374) +++ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetArtifact.java 2012-10-09 13:20:18 UTC (rev 44375) @@ -1,5 +1,14 @@ package org.jboss.tools.tycho.targets; +import java.io.File; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; +import org.apache.maven.execution.MavenSession; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.repository.RepositorySystem; + public class TargetArtifact { private String groupId; @@ -24,4 +33,22 @@ public String toString() { return this.groupId + ":" + this.artifactId + ":" + this.version; } + + public File getFile(RepositorySystem repositorySystem, MavenSession session, MavenProject project) throws MojoExecutionException { + if (!isCorrectlySet()) { + throw new MojoExecutionException("'sourceTargetArtifact' must define groupId, artifactId and version"); + } + Artifact artifact = repositorySystem.createArtifactWithClassifier(this.groupId, this.artifactId, this.version, "target", this.artifactId); + ArtifactResolutionRequest request = new ArtifactResolutionRequest(); + request.setArtifact(artifact); + request.setLocalRepository(session.getLocalRepository()); + request.setRemoteRepositories(project.getRemoteArtifactRepositories()); + repositorySystem.resolve(request); + + if (!artifact.isResolved()) { + throw new MojoExecutionException("Could not resolve target platform specification artifact " + artifact); + } + + return artifact.getFile(); + } } Modified: trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetToRepoMojo.java =================================================================== --- trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetToRepoMojo.java 2012-10-09 12:32:55 UTC (rev 44374) +++ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetToRepoMojo.java 2012-10-09 13:20:18 UTC (rev 44375) @@ -20,6 +20,8 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; +import org.apache.maven.repository.RepositorySystem; +import org.codehaus.plexus.component.annotations.Requirement; import org.eclipse.sisu.equinox.EquinoxServiceFactory; import org.eclipse.tycho.BuildOutputDirectory; import org.eclipse.tycho.p2.resolver.TargetDefinitionFile; @@ -51,30 +53,51 @@ * @readonly */ private MavenSession session; + /** + * @component + */ + @Requirement + private RepositorySystem repositorySystem; /** - * @parameter expression="${project.artifactId}.target" + * @parameter */ - private File targetFile; + private File sourceTargetFile; /** + * @parameter + */ + private TargetArtifact sourceTargetArtifact; + + /** * @parameter expression="${project.build.directory}/${project.artifactId}.target.repo" */ - private File targetRepository; + private File outputRepository; /** @component */ private EquinoxServiceFactory p2; public void execute() throws MojoExecutionException, MojoFailureException { try { - if (!this.targetFile.isFile()) { - throw new MojoExecutionException("Specified 'targetFile' (value: " + targetFile + ") is not a valid file"); + if (this.sourceTargetArtifact != null && this.sourceTargetFile != null) { + getLog().debug("sourceTargetArtifact: " + this.sourceTargetArtifact.toString()); + getLog().debug("sourceTargetFile; " + this.sourceTargetFile.toString()); + throw new MojoExecutionException("Set either 'sourceTargetArtifact' XOR 'sourceTargetFile'"); } - this.targetRepository.mkdirs(); + if (this.sourceTargetFile == null && this.sourceTargetArtifact == null) { + this.sourceTargetFile = new File(this.project.getBasedir(), this.project.getArtifactId() + ".target"); + } + if (this.sourceTargetArtifact != null) { + this.sourceTargetFile = this.sourceTargetArtifact.getFile(this.repositorySystem, this.session, this.project); + } + if (!this.sourceTargetFile.isFile()) { + throw new MojoExecutionException("Specified 'targetFile' (value: " + sourceTargetFile + ") is not a valid file"); + } + this.outputRepository.mkdirs(); final MirrorApplicationService mirrorService = p2.getService(MirrorApplicationService.class); - TargetDefinitionFile target = TargetDefinitionFile.read(targetFile); + TargetDefinitionFile target = TargetDefinitionFile.read(sourceTargetFile); final RepositoryReferences sourceDescriptor = new RepositoryReferences(); for (final Location loc : target.getLocations()) { if (loc instanceof InstallableUnitLocation) { @@ -85,7 +108,7 @@ } } - final DestinationRepositoryDescriptor destinationDescriptor = new DestinationRepositoryDescriptor(this.targetRepository, this.targetFile.getName(), true, false, true); + final DestinationRepositoryDescriptor destinationDescriptor = new DestinationRepositoryDescriptor(this.outputRepository, this.sourceTargetFile.getName(), true, false, true); mirrorService.mirrorStandalone(sourceDescriptor, destinationDescriptor, createIUDescriptions(target), createMirrorOptions(), new BuildOutputDirectory(this.project.getBuild().getOutputDirectory())); } catch (Exception ex) {

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44374 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.

by jbosstools-commits＠lists.jboss.org

Author: ldimaggio Date: 2012-10-09 08:32:55 -0400 (Tue, 09 Oct 2012) New Revision: 44374 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java Log: It's now looking like Jenkins on a Mac cannot find the example Downloading... shell - not an issue running locally - only on Jenkins Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-09 09:57:48 UTC (rev 44373) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-09 12:32:55 UTC (rev 44374) @@ -128,10 +128,18 @@ int projSize = getProjectSize(wiz.textWithLabel(JBossToolsProjectExamples.TEXT_PROJECT_SIZE).getText()); wiz.button(IDELabel.Button.FINISH).click(); + /* ldimaggi - debugging failures of SOA examples on Jenkins/Mac */ + SWTBotShell shell = null; log.info("Downloading the example"); - SWTBotShell shell = bot.shell("Downloading..."); + try { + shell = bot.shell("Downloading..."); + } + catch (Exception E) { + log.error("Could not find the Downloading... shell: " + E.getMessage()); + E.printStackTrace(); + } log.info("Activate the downloading shell"); - + /* ldimaggi - debugging failures of SOA examples on Jenkins/Mac */ try { shell.activate(); @@ -140,7 +148,6 @@ log.error("Could not activate shell: " + E.getMessage()); E.printStackTrace(); } - log.info("wait until shell closes"); bot.waitUntil(shellCloses(shell),Timing.time(projSize*20*1000));

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44373 - in trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooling: 3.3.1.ER1 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: gvarsami Date: 2012-10-09 05:57:48 -0400 (Tue, 09 Oct 2012) New Revision: 44373 Added: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... Log: Added compositew site for 3.3.1_ER1 Added: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... =================================================================== --- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... (rev 0) +++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-09 09:57:48 UTC (rev 44373) @@ -0,0 +1,28 @@ +<?xml version='1.0' encoding='UTF-8'?> +<?compositeArtifactRepository version='1.0.0'?> +<repository name='JBoss Tools - SOA Tooling - Staging Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> +<properties size='2'> +<property name='p2.compressed' value='true'/> + +<property name='p2.timestamp' value='1349776559000'/> +</properties> +<children size='10'> + + + +<child location='../../../../staging/soatools-3.3.0_GA.component--bpel/all/repo/'/> +<child location='../../../../staging/soatools-3.3.1_ER1.component--droolsjbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--esb/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--flow/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--jbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--modeshape/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--runtime-soa/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--teiid-designer/all/repo/'/> +<child location='http://download.jboss.org/savara/releases/updates/2.0.0.Final/' /> +<child location='http://download.jboss.org/jbosstools/updates/stable/indigo/soa-tooling/sw...'/> + +</children> +</repository> Added: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... =================================================================== --- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... (rev 0) +++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-09 09:57:48 UTC (rev 44373) @@ -0,0 +1,28 @@ +<?xml version='1.0' encoding='UTF-8'?> +<?compositeMetadataRepository version='1.0.0'?> +<repository name='JBoss Tools - SOA Tooling - Staging Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> +<properties size='2'> +<property name='p2.compressed' value='true'/> + +<property name='p2.timestamp' value='1349776559000'/> +</properties> +<children size='10'> + + + +<child location='../../../../staging/soatools-3.3.0_GA.component--bpel/all/repo/'/> +<child location='../../../../staging/soatools-3.3.1_ER1.component--droolsjbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--esb/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--flow/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--jbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--modeshape/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--runtime-soa/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_GA.component--teiid-designer/all/repo/'/> +<child location='http://download.jboss.org/savara/releases/updates/2.0.0.Final/'/> +<child location='http://download.jboss.org/jbosstools/updates/stable/indigo/soa-tooling/sw...'/> + +</children> +</repository>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44372 - trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2012-10-09 05:16:59 -0400 (Tue, 09 Oct 2012) New Revision: 44372 Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExampleDelegate.java Log: JBIDE-12819 open README.md for imported maven projects which name differs from artifactId Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExampleDelegate.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExampleDelegate.java 2012-10-09 08:33:45 UTC (rev 44371) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExampleDelegate.java 2012-10-09 09:16:59 UTC (rev 44372) @@ -21,25 +21,22 @@ import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.MavenModelManager; import org.eclipse.m2e.core.project.AbstractProjectScanner; +import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.LocalProjectScanner; import org.eclipse.m2e.core.project.MavenProjectInfo; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.ui.internal.actions.OpenMavenConsoleAction; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; import org.jboss.tools.maven.ui.Activator; import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.model.ProjectExample; @@ -246,7 +243,13 @@ Model model = info.getModel(); if (model != null && model.getArtifactId() != null && model.getArtifactId().trim().length() > 0) { - projectNames.add(model.getArtifactId()); + + IMavenProjectFacade f = MavenPlugin.getMavenProjectRegistry().getMavenProject(model.getGroupId(), + model.getArtifactId(), + model.getVersion()); + if (f != null && f.getProject() != null) { + projectNames.add(f.getProject().getName()); + } } } } catch (CoreException ex) {

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44371 - trunk/build/parent.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-09 04:33:45 -0400 (Tue, 09 Oct 2012) New Revision: 44371 Modified: trunk/build/parent/pom.xml Log: Adding comment to reference an m2e bug Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-10-09 08:15:52 UTC (rev 44370) +++ trunk/build/parent/pom.xml 2012-10-09 08:33:45 UTC (rev 44371) @@ -284,6 +284,7 @@ <plugins>  +  <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId>

12 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2012