April 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r30250 - in trunk/download.jboss.org/jbosstools/updates: requirements/birt and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-04-03 18:44:50 -0400 (Sun, 03 Apr 2011) New Revision: 30250 Added: trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml trunk/download.jboss.org/jbosstools/updates/requirements/indigo/index.html trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml Removed: trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-indig... trunk/download.jboss.org/jbosstools/updates/requirements/indigo/README.txt trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-i... Modified: trunk/download.jboss.org/jbosstools/updates/indigo/README.txt trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/index.html trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml trunk/download.jboss.org/jbosstools/updates/requirements/emf/index.html trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html Log: add Indigo, BIRT, Eclipse, EMF, and WTP M6 bits; update README and rename build-indigo.xml to build.xml Modified: trunk/download.jboss.org/jbosstools/updates/indigo/README.txt =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/README.txt 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/indigo/README.txt 2011-04-03 22:44:50 UTC (rev 30250) @@ -1,20 +1,4 @@ -Instead of mirroring Helios here, composite a site here from: +Instead of mirroring Helios here, composite a site. +See composite*.xml for contained site refs. -<children size='14'> -<child location='../requirements/indigo/201102040900/'/> -<child location='../requirements/birt/4.0/'/> -<child location='../requirements/ecf/3.4/'/> -<child location='../requirements/eclipse/3.7M5/'/> -<child location='../requirements/emf/2.7M5/'/> -<child location='../requirements/gwt/201102111811/'/> -<child location='../requirements/m2eclipse/0.13.0.201103291237/'/> -<child location='../requirements/orbit/S20110124210048/'/> -<child location='../requirements/subclipse/1.6/'/> -<child location='../requirements/subversive/0.7.9_2.2.2/'/> -<child location='../requirements/swtbot/2.0.3/'/> -<child location='../requirements/webtools/3.3M5/'/> -<child location='../requirements/xulrunner-1.9.1.2/'/> -</children> - -See /updates/requirements/indigo/README.txt for how to mirror from eclipse.org to here. -See /updates/requirements/{birt,gwt,swtbot,webtools,...}/build.xml for how to mirror other sites. +See /updates/requirements/{*}/build.xml for how to mirror other sites. Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-03 22:44:50 UTC (rev 30250) @@ -7,21 +7,22 @@ get new time w/ date +%s000 --> -<property name='p2.timestamp' value='1301500607000'/> +<property name='p2.timestamp' value='1301866904000'/> </properties> <children size='14'> -<child location='../requirements/indigo/201102040900/'/> -<child location='../requirements/birt/4.0M5/'/> +<child location='../requirements/indigo/3.7M6/'/> +<child location='../requirements/birt/4.0M6/'/> +<child location='../requirements/eclipse/3.7M6/'/> +<child location='../requirements/emf/2.7M6/'/> +<child location='../requirements/webtools/3.3M6/'/> + <child location='../requirements/ecf/3.4/'/> -<child location='../requirements/eclipse/3.7M5/'/> -<child location='../requirements/emf/2.7M5/'/> <child location='../requirements/gwt/201102111811/'/> <child location='../requirements/m2eclipse/0.13.0.201103291237/'/> <child location='../requirements/orbit/S20110124210048/'/> <child location='../requirements/subclipse/1.6/'/> <child location='../requirements/subversive/0.7.9_2.2.2/'/> <child location='../requirements/swtbot/2.0.3/'/> -<child location='../requirements/webtools/3.3M5/'/> <child location='../requirements/xulrunner-1.9.1.2/'/> </children> </repository> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-03 22:44:50 UTC (rev 30250) @@ -7,21 +7,22 @@ get new time w/ date +%s000 --> -<property name='p2.timestamp' value='1301500607000'/> +<property name='p2.timestamp' value='1301866904000'/> </properties> <children size='14'> -<child location='../requirements/indigo/201102040900/'/> -<child location='../requirements/birt/4.0M5/'/> +<child location='../requirements/indigo/3.7M6/'/> +<child location='../requirements/birt/4.0M6/'/> +<child location='../requirements/eclipse/3.7M6/'/> +<child location='../requirements/emf/2.7M6/'/> +<child location='../requirements/webtools/3.3M6/'/> + <child location='../requirements/ecf/3.4/'/> -<child location='../requirements/eclipse/3.7M5/'/> -<child location='../requirements/emf/2.7M5/'/> <child location='../requirements/gwt/201102111811/'/> <child location='../requirements/m2eclipse/0.13.0.201103291237/'/> <child location='../requirements/orbit/S20110124210048/'/> <child location='../requirements/subclipse/1.6/'/> <child location='../requirements/subversive/0.7.9_2.2.2/'/> <child location='../requirements/swtbot/2.0.3/'/> -<child location='../requirements/webtools/3.3M5/'/> <child location='../requirements/xulrunner-1.9.1.2/'/> </children> </repository> Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-indig... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-indig... 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-indig... 2011-04-03 22:44:50 UTC (rev 30250) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project default="mirror"> -  - <target name="mirror"> - <property name="URL" value="http://download.eclipse.org/birt/update-site/4.0-interim/" /> - <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/birt/" /> - <property name="compress" value="true" /> - - <p2.mirror> - <repository location="file:${destination}/4.0" name="Extra BIRT plugins for Eclipse 3.7 (Not in Indigo)" /> - <source> - <repository location="${URL}" /> - </source> - - <slicingOptions includeFeatures="true" followStrict="true" /> - - <iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group" /> - <iu id="org.eclipse.birt.feature.group" /> - <iu id="org.eclipse.birt.integration.wtp.feature.group" /> - <iu id="org.eclipse.birt.chart.feature.group" /> - <iu id="org.eclipse.birt.chart.integration.wtp.feature.group" /> - - </p2.mirror> - - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/4.0" artifactRepository="file:${destination}/4.0" publishartifacts="true" source="${destination}/4.0" compress="${compress}" /> - </target> -</project> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml (from rev 30249, trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-indig...) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml 2011-04-03 22:44:50 UTC (rev 30250) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="mirror"> +  + <target name="mirror"> + <property name="URL" value="http://download.eclipse.org/birt/update-site/4.0-interim/" /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/birt/" /> + <property name="compress" value="true" /> + + <p2.mirror> + <repository location="file:${destination}/4.0M6/" name="Extra BIRT plugins for Eclipse 3.7 (Not in Indigo)" /> + <source> + <repository location="${URL}" /> + </source> + + <slicingOptions includeFeatures="true" followStrict="true" /> + + <iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group" /> + <iu id="org.eclipse.birt.feature.group" /> + <iu id="org.eclipse.birt.integration.wtp.feature.group" /> + <iu id="org.eclipse.birt.chart.feature.group" /> + <iu id="org.eclipse.birt.chart.integration.wtp.feature.group" /> + + </p2.mirror> + + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/4.0M6/" artifactRepository="file:${destination}/4.0M6/" publishartifacts="true" source="${destination}/4.0M6/" compress="${compress}" /> + </target> +</project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html 2011-04-03 22:44:50 UTC (rev 30250) @@ -46,6 +46,7 @@ --> <br/> <ul> +<li><a class=link href=4.0M6>4.0M6</a> (Indigo) </li> <li><a class=link href=4.0M5>4.0M5</a> (Indigo) </li> <li><a class=link href=2.6.2>2.6.2</a> (Helios) </li> </ul> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2011-04-03 22:44:50 UTC (rev 30250) @@ -22,7 +22,7 @@ <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/3.7/" name="Eclipse 3.7" /> + <repository location="file:${destination}/3.7M6/" name="Eclipse 3.7" /> <source> <repository location="${URL}" /> </source> @@ -30,6 +30,6 @@ <slicingOptions includeFeatures="true" followStrict="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7/" artifactRepository="file:${destination}/3.7/" publishartifacts="true" source="${destination}/3.7/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7M6/" artifactRepository="file:${destination}/3.7M6/" publishartifacts="true" source="${destination}/3.7M6/" compress="${compress}" /> </target> </project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/index.html =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/index.html 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/index.html 2011-04-03 22:44:50 UTC (rev 30250) @@ -46,6 +46,7 @@ --> <br/> <ul> +<li><a class=link href=3.7M6>3.7M6</a> </li> <li><a class=link href=3.7M5>3.7M5</a> </li> <li><a class=link href=3.6.2>3.6.2</a> </li> </ul> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml 2011-04-03 22:44:50 UTC (rev 30250) @@ -22,7 +22,7 @@ <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/2.7/" name="EMF plugins for Eclipse 3.7" /> + <repository location="file:${destination}/2.7M6/" name="EMF plugins for Eclipse 3.7" /> <source> <repository location="${URL}" /> </source> @@ -30,6 +30,6 @@ <slicingOptions includeFeatures="true" followStrict="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.7/" artifactRepository="file:${destination}/2.7/" publishartifacts="true" source="${destination}/2.7/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.7M6/" artifactRepository="file:${destination}/2.7M6/" publishartifacts="true" source="${destination}/2.7M6/" compress="${compress}" /> </target> </project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/emf/index.html =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/emf/index.html 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/requirements/emf/index.html 2011-04-03 22:44:50 UTC (rev 30250) @@ -46,7 +46,8 @@ --> <br/> <ul> -<li><a class=link href=2.7>2.7</a> </li> +<li><a class=link href=2.7M6>2.7M6</a> </li> +<li><a class=link href=2.7M5>2.7M5</a> </li> <li><a class=link href=2.6>2.6</a> </li> </ul> <br/> Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/indigo/README.txt =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/indigo/README.txt 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/requirements/indigo/README.txt 2011-04-03 22:44:50 UTC (rev 30250) @@ -1,14 +0,0 @@ -To rsync a mirror from eclipse.org to here, do the following: - -1. ssh to qa01, then sudo to hudson: - -$ ssh nboldt(a)qa01.qa.atl2.redhat.com -$ sudo su - hudson - -2. rsync build.eclipse.org to reports.qa: - -$ rsync -aP --delete nickb@build.eclipse.org:~/downloads/releases/indigo/* /qa/services/http/binaries/RHDS/updates/requirements/indigo/ - -3. rsync reports.qa to download.jboss.org: - -$ rsync -aP --delete /qa/services/http/binaries/RHDS/updates/requirements/indigo/* tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/requirements/indigo/ Copied: trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml (from rev 30249, trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2011-04-03 22:44:50 UTC (rev 30250) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="mirror"> +  + <target name="mirror"> + <property name="URL" value="http://download.eclipse.org/releases/indigo/201103180900/aggregate/" /> + + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/indigo/" /> + <property name="compress" value="true" /> + + <p2.mirror> + <repository location="file:${destination}/M6/" name="Indigo M6" /> + <source> + <repository location="${URL}" /> + </source> + + <slicingOptions includeFeatures="true" followStrict="true" /> + </p2.mirror> + + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/M6/" artifactRepository="file:${destination}/M6/" publishartifacts="true" source="${destination}/M6/" compress="${compress}" /> + </target> +</project> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/indigo/index.html (from rev 30249, trunk/download.jboss.org/jbosstools/updates/requirements/emf/index.html) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/indigo/index.html (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/indigo/index.html 2011-04-03 22:44:50 UTC (rev 30250) @@ -0,0 +1,69 @@ +<html> +<head> +<title>JBoss Tools Build Requirements - Indigo Updates</title> +<style> +@import url("../../web/site.css"); +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>  </td> + </tr> + <tr> + <td>  </td> + <td> + <h2 class="title">JBoss Tools Build Requirements - Indigo Updates</h2> + <table width="100%"> + +  + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> +  + + + <br/> + <ul> +<li><a class=link href=M6>M6</a> </li> +<li><a class=link href=M5>M5</a> </li> + </ul> + <br/> + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">Looking to download JBoss Tools? See <a class="link" + href="http://www.jboss.org/tools/download">JBoss Tools + Downloads</a>. See also <a + href="http://www.jboss.org/tools/download/installation">Installation + methods</a>.</p> + </td> + </tr> + </table> + </td> + </tr> +</table> +</html> Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-i... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-i... 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-i... 2011-04-03 22:44:50 UTC (rev 30250) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project default="mirror"> -  - <target name="mirror"> - <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.0/S-3.3.0M5-201..." /> - <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/" /> - <property name="compress" value="true" /> - - <p2.mirror> - <repository location="file:${destination}/3.3" name="Web Tools plugins for Eclipse 3.7 Indigo" /> - <source> - <repository location="${URL}" /> - </source> - - <slicingOptions includeFeatures="true" followStrict="true" /> - - </p2.mirror> - - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3" artifactRepository="file:${destination}/3.3" publishartifacts="true" source="${destination}/3.3" compress="${compress}" /> - </target> -</project> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml (from rev 30249, trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-i...) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2011-04-03 22:44:50 UTC (rev 30250) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="mirror"> +  + <target name="mirror"> + <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.0/S-3.3.0M6-201..." /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/" /> + <property name="compress" value="true" /> + + <p2.mirror> + <repository location="file:${destination}/3.3M6/" name="Web Tools plugins for Eclipse 3.7 Indigo" /> + <source> + <repository location="${URL}" /> + </source> + + <slicingOptions includeFeatures="true" followStrict="true" /> + + </p2.mirror> + + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3M6/" artifactRepository="file:${destination}/3.3M6/" publishartifacts="true" source="${destination}/3.3M6/" compress="${compress}" /> + </target> +</project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html 2011-04-03 22:43:36 UTC (rev 30249) +++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html 2011-04-03 22:44:50 UTC (rev 30250) @@ -46,6 +46,7 @@ --> <br/> <ul> +<li><a class=link href=3.3M6>3.3M6</a> (Indigo) </li> <li><a class=link href=3.3M5>3.3M5</a> (Indigo) </li> <li><a class=link href=3.2.3>3.2.3</a> (Helios) </li> </ul>

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r30249 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-04-03 18:43:36 -0400 (Sun, 03 Apr 2011) New Revision: 30249 Modified: trunk/build/target-platform/multiple.target trunk/build/target-platform/multiple.target.p2mirror.xml trunk/build/target-platform/unified.target trunk/build/target-platform/unified.target.p2mirror.xml Log: add plugins required by m2e 0.13 per Sneja's email Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2011-04-03 16:52:26 UTC (rev 30248) +++ trunk/build/target-platform/multiple.target 2011-04-03 22:43:36 UTC (rev 30249) @@ -14,10 +14,27 @@ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <repository location="http://download.jboss.org/jbosstools/updates/indigo/"/> -  +  <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201103291237"/> +  <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201103231111"/> <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/> + <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/> + <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/> + <unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/> + <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/> + <unit id="com.ning.async-http-client" version="1.6.3.20110315-1708"/> + <unit id="org.jboss.netty" version="3.2.4.Final"/> + <unit id="org.eclipse.epp.mpc.core" version="1.0.0.v20100826-2143"/> + <unit id="org.eclipse.epp.mpc.help.ui" version="1.0.0.v20100826-2143"/> + <unit id="org.eclipse.epp.mpc.ui" version="1.0.1.v20100826-2143"/> + <unit id="org.eclipse.epp.usagedata.gathering" version="1.3.0.R201005261100"/> + <unit id="org.eclipse.epp.usagedata.recording" version="1.3.0.R201005261100"/> + <unit id="org.eclipse.epp.usagedata.ui" version="1.3.0.R201005261100"/> + <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110118-1616"/> + <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20100920"/> + <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100920"/> + <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110128-1111"/> <unit id="javax.wsdl" version="1.6.2.v201012040545"/> <unit id="org.apache.oro" version="2.0.8.v201005080400"/> Modified: trunk/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-04-03 16:52:26 UTC (rev 30248) +++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-04-03 22:43:36 UTC (rev 30249) @@ -34,11 +34,25 @@ <iu id="org.eclipse.m2e.feature.feature.group" version=""/> <iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/> <iu id="org.slf4j.api" version=""/> +<iu id="ch.qos.logback.classic" version=""/> +<iu id="ch.qos.logback.core" version=""/> +<iu id="ch.qos.logback.slf4j" version=""/> +<iu id="org.slf4j.api" version=""/> +<iu id="com.ning.async-http-client" version=""/> +<iu id="org.jboss.netty" version=""/> +<iu id="org.eclipse.epp.mpc.core" version=""/> +<iu id="org.eclipse.epp.mpc.help.ui" version=""/> +<iu id="org.eclipse.epp.mpc.ui" version=""/> +<iu id="org.eclipse.epp.usagedata.gathering" version=""/> +<iu id="org.eclipse.epp.usagedata.recording" version=""/> +<iu id="org.eclipse.epp.usagedata.ui" version=""/> +<iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/> +<iu id="org.eclipse.equinox.p2.discovery" version=""/> +<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/> +<iu id="org.eclipse.net4j.jms.api" version=""/> <iu id="javax.wsdl" version=""/> <iu id="org.apache.oro" version=""/> <iu id="org.jdom" version=""/> -<iu id="org.mozilla.xulrunner.feature.feature.group" version=""/> -<iu id="org.mozilla.xpcom.feature.feature.group" version=""/> <iu id="org.eclipse.emf.ecore.feature.group" version=""/> <iu id="org.eclipse.emf.feature.group" version=""/> <iu id="org.eclipse.emf.codegen.feature.group" version=""/> @@ -179,9 +193,6 @@ <iu id="org.eclipse.wst.web_core.feature.feature.group" version=""/> <iu id="org.eclipse.wst.ws_ui.feature.feature.group" version=""/> <iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/> -<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/> -<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version=""/> -<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/> <iu id="org.drools.eclipse.feature.feature.group" version=""/> <iu id="org.drools.eclipse.task.feature.feature.group" version=""/> <iu id="org.guvnor.tools.feature.feature.group" version=""/> Modified: trunk/build/target-platform/unified.target =================================================================== --- trunk/build/target-platform/unified.target 2011-04-03 16:52:26 UTC (rev 30248) +++ trunk/build/target-platform/unified.target 2011-04-03 22:43:36 UTC (rev 30249) @@ -14,17 +14,32 @@ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..."/> -  +  <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201103291237"/> <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201103231111"/> <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/> + <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/> + <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/> + <unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/> + <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/> + <unit id="com.ning.async-http-client" version="1.6.3.20110315-1708"/> + <unit id="org.jboss.netty" version="3.2.4.Final"/> + <unit id="org.eclipse.epp.mpc.core" version="1.0.0.v20100826-2143"/> + <unit id="org.eclipse.epp.mpc.help.ui" version="1.0.0.v20100826-2143"/> + <unit id="org.eclipse.epp.mpc.ui" version="1.0.1.v20100826-2143"/> + <unit id="org.eclipse.epp.usagedata.gathering" version="1.3.0.R201005261100"/> + <unit id="org.eclipse.epp.usagedata.recording" version="1.3.0.R201005261100"/> + <unit id="org.eclipse.epp.usagedata.ui" version="1.3.0.R201005261100"/> + <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110118-1616"/> + <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20100920"/> + <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100920"/> + <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110128-1111"/> <unit id="javax.wsdl" version="1.6.2.v201012040545"/> <unit id="org.apache.oro" version="2.0.8.v201005080400"/> <unit id="org.jdom" version="1.0.0.v201005080400"/> -  <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.0.v20110128-1409"/> @@ -197,7 +212,7 @@  + <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/> --> </location> </locations> Modified: trunk/build/target-platform/unified.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/unified.target.p2mirror.xml 2011-04-03 16:52:26 UTC (rev 30248) +++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-04-03 22:43:36 UTC (rev 30249) @@ -34,11 +34,25 @@ <iu id="org.eclipse.m2e.feature.feature.group" version=""/> <iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/> <iu id="org.slf4j.api" version=""/> +<iu id="ch.qos.logback.classic" version=""/> +<iu id="ch.qos.logback.core" version=""/> +<iu id="ch.qos.logback.slf4j" version=""/> +<iu id="org.slf4j.api" version=""/> +<iu id="com.ning.async-http-client" version=""/> +<iu id="org.jboss.netty" version=""/> +<iu id="org.eclipse.epp.mpc.core" version=""/> +<iu id="org.eclipse.epp.mpc.help.ui" version=""/> +<iu id="org.eclipse.epp.mpc.ui" version=""/> +<iu id="org.eclipse.epp.usagedata.gathering" version=""/> +<iu id="org.eclipse.epp.usagedata.recording" version=""/> +<iu id="org.eclipse.epp.usagedata.ui" version=""/> +<iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/> +<iu id="org.eclipse.equinox.p2.discovery" version=""/> +<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/> +<iu id="org.eclipse.net4j.jms.api" version=""/> <iu id="javax.wsdl" version=""/> <iu id="org.apache.oro" version=""/> <iu id="org.jdom" version=""/> -<iu id="org.mozilla.xulrunner.feature.feature.group" version=""/> -<iu id="org.mozilla.xpcom.feature.feature.group" version=""/> <iu id="org.eclipse.emf.ecore.feature.group" version=""/> <iu id="org.eclipse.emf.feature.group" version=""/> <iu id="org.eclipse.emf.codegen.feature.group" version=""/> @@ -179,9 +193,6 @@ <iu id="org.eclipse.wst.web_core.feature.feature.group" version=""/> <iu id="org.eclipse.wst.ws_ui.feature.feature.group" version=""/> <iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/> -<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/> -<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version=""/> -<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/> <iu id="org.drools.eclipse.feature.feature.group" version=""/> <iu id="org.drools.eclipse.task.feature.feature.group" version=""/> <iu id="org.guvnor.tools.feature.feature.group" version=""/>

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r30248 - in trunk/runtime: plugins/org.jboss.tools.runtime and 12 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-04-03 12:52:26 -0400 (Sun, 03 Apr 2011) New Revision: 30248 Modified: trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml trunk/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml trunk/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF trunk/runtime/plugins/org.jboss.tools.runtime.core/pom.xml trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/AbstractRuntimeDetector.java trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetector.java trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/ServerDefinition.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF trunk/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeContentProvider.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java trunk/runtime/plugins/org.jboss.tools.runtime/META-INF/MANIFEST.MF trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JbpmHandler.java trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/SeamHandler.java trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/IRuntimeDetectionConstants.java trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java Log: JBIDE-8128 [JBossTools Runtimes] Allow user to select what runtime types to be added Modified: trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml 2011-04-03 16:52:26 UTC (rev 30248) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.runtime.test.feature" label="Feature" - version="1.0.0.qualifier"> + version="1.3.0.qualifier"> <description> %description Modified: trunk/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml 2011-04-03 16:52:26 UTC (rev 30248) @@ -8,6 +8,6 @@ </parent> <groupId>org.jboss.tools.runtime.features</groupId> <artifactId>org.jboss.tools.runtime.test.feature</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> \ No newline at end of file Modified: trunk/runtime/plugins/org.jboss.tools.runtime/META-INF/MANIFEST.MF =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime/META-INF/MANIFEST.MF 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime/META-INF/MANIFEST.MF 2011-04-03 16:52:26 UTC (rev 30248) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %BundleName Bundle-SymbolicName: org.jboss.tools.runtime;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.jboss.tools.runtime.Activator Bundle-Vendor: %BundleVendor Require-Bundle: org.eclipse.core.runtime, Modified: trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml 2011-04-03 16:52:26 UTC (rev 30248) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.runtime</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> \ No newline at end of file Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -32,18 +32,24 @@ droolsRuntimes.add(runtime); } } + initializeInternal(serverDefinitions, droolsRuntimes); + if (droolsRuntimes.size() > 0) { + DroolsRuntime[] dra = droolsRuntimes.toArray(new DroolsRuntime[0]); + DroolsRuntimeManager.setDroolsRuntimes(dra); + } + + } + + private void initializeInternal(List<ServerDefinition> serverDefinitions, + List<DroolsRuntime> droolsRuntimes) { for (ServerDefinition serverDefinition : serverDefinitions) { String type = serverDefinition.getType(); if (serverDefinition.isEnabled() && !droolsExists(serverDefinition)) { - if (SOA_P.equals(type) || DROOLS.equals(type)) { + if (DROOLS.equals(type)) { File droolsRoot = serverDefinition.getLocation(); //$NON-NLS-1$ if (droolsRoot.isDirectory()) { DroolsRuntime runtime = new DroolsRuntime(); - if (SOA_P.equals(type)) { - runtime.setName("Drools - " + serverDefinition.getName()); //$NON-NLS-1$ - } else { - runtime.setName("Drools " + serverDefinition.getVersion()+ " - " + serverDefinition.getName()); //$NON-NLS-1$ - } + runtime.setName("Drools " + serverDefinition.getVersion()+ " - " + serverDefinition.getName()); //$NON-NLS-1$ runtime.setPath(droolsRoot.getAbsolutePath()); DroolsRuntimeManager.recognizeJars(runtime); runtime.setDefault(true); @@ -51,12 +57,8 @@ } } } + initializeInternal(serverDefinition.getIncludedServerDefinitions(), droolsRuntimes); } - if (droolsRuntimes.size() > 0) { - DroolsRuntime[] dra = droolsRuntimes.toArray(new DroolsRuntime[0]); - DroolsRuntimeManager.setDroolsRuntimes(dra); - } - } /** @@ -118,4 +120,18 @@ } return droolsExists(serverDefinition); } + + public static void calculateIncludedServerDefinition( + ServerDefinition serverDefinition) { + if (serverDefinition == null || !SOA_P.equals(serverDefinition.getType())) { + return; + } + File droolsRoot = serverDefinition.getLocation(); //$NON-NLS-1$ + if (droolsRoot.isDirectory()) { + String name = "Drools - " + serverDefinition.getName(); //$NON-NLS-1$ + ServerDefinition sd = new ServerDefinition(name, serverDefinition.getVersion(), DROOLS, droolsRoot); + sd.setParent(serverDefinition); + serverDefinition.getIncludedServerDefinitions().add(sd); + } + } } Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -13,6 +13,8 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Properties; @@ -139,6 +141,7 @@ } createJBossServer(serverDefinition.getLocation(),index,serverDefinition.getName(),serverDefinition.getName() + " " + RUNTIME); //$NON-NLS-1$ } + createJBossServerFromDefinitions(serverDefinition.getIncludedServerDefinitions()); } } @@ -373,10 +376,27 @@ ServerDefinition serverDefinition = new ServerDefinition(serverBean.getName(), serverBean.getVersion(), serverBean.getType().getId(), new File(serverBean.getLocation())); serverDefinition.setDescription(includedRuntimes(serverDefinition)); + calculateIncludedServerDefinition(serverDefinition); return serverDefinition; } return null; } + + private void calculateIncludedServerDefinition(ServerDefinition serverDefinition) { + if (serverDefinition == null || serverDefinition.getType() == null) { + return; + } + serverDefinition.getIncludedServerDefinitions().clear(); + String type = serverDefinition.getType(); + if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) || EWP.equals(type)) { + SeamHandler.calculateIncludedServerDefinition(serverDefinition); + + } + if (SOA_P.equals(type)) { + DroolsHandler.calculateIncludedServerDefinition(serverDefinition); + JbpmHandler.calculateIncludedServerDefinition(serverDefinition); + } + } @Override public String includedRuntimes(ServerDefinition serverDefinition) { @@ -436,4 +456,12 @@ } return false; } + + @Override + public void computeIncludedServerDefinition( + ServerDefinition serverDefinition) { + calculateIncludedServerDefinition(serverDefinition); + } + + } Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JbpmHandler.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JbpmHandler.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JbpmHandler.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -48,18 +48,11 @@ continue; } String type = serverDefinition.getType(); - if (SOA_P.equals(type)) { - if (jbpmRoot.isDirectory()) { - String version = JBPM3; - if (isJbpm4(serverDefinition.getLocation().getAbsolutePath())) { - version = JBPM4; - } - PreferencesManager.getInstance().initializeDefaultJbpmInstallation(serverDefinition.getName(), jbpmRoot.getAbsolutePath(), version); - } - } else if (JBPM.equals(type)) { + if (JBPM.equals(type)) { PreferencesManager.getInstance().addJbpmInstallation(serverDefinition.getName(), jbpmRoot.getAbsolutePath(), serverDefinition.getVersion()); } } + initializeRuntimes(serverDefinition.getIncludedServerDefinitions()); } } @@ -134,4 +127,21 @@ } return jbpmExists(serverDefinition); } + + public static void calculateIncludedServerDefinition( + ServerDefinition serverDefinition) { + if (serverDefinition == null || !SOA_P.equals(serverDefinition.getType())) { + return; + } + File jbpmRoot = new File(serverDefinition.getLocation(),"jbpm-jpdl"); //$NON-NLS-1$ + if (jbpmRoot.isDirectory()) { + String version = JBPM3; + if (isJbpm4(serverDefinition.getLocation().getAbsolutePath())) { + version = JBPM4; + } + ServerDefinition sd = new ServerDefinition(serverDefinition.getName(), version, JBPM, jbpmRoot); + sd.setParent(serverDefinition); + serverDefinition.getIncludedServerDefinitions().add(sd); + } + } } Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/SeamHandler.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/SeamHandler.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/SeamHandler.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -41,14 +41,14 @@ public static File getSeamRoot(ServerDefinition serverDefinition) { String type = serverDefinition.getType(); - if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) || EWP.equals(type) ) { - for (String folder : SEAM_HOME_FOLDER_OPTIONS) { - File seamFile = new File(serverDefinition.getLocation(),folder); //$NON-NLS-1$ - if (seamFile != null && seamFile.isDirectory()) { - return seamFile; - } - } - } +// if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) || EWP.equals(type) ) { +// for (String folder : SEAM_HOME_FOLDER_OPTIONS) { +// File seamFile = new File(serverDefinition.getLocation(),folder); //$NON-NLS-1$ +// if (seamFile != null && seamFile.isDirectory()) { +// return seamFile; +// } +// } +// } if (SEAM.equals(type)) { return serverDefinition.getLocation(); } @@ -59,23 +59,15 @@ Map<String, SeamRuntime> map = new HashMap<String,SeamRuntime>(); - // to fix https://jira.jboss.org/jira/browse/JBDS-682 - // seam runtime initialization goes throug added servers first and - // then process seam runtimes from bundled servers for(ServerDefinition serverDefinition:serverDefinitions) { if (!serverDefinition.isEnabled()) { continue; } String type = serverDefinition.getType(); - if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) || EWP.equals(type) ) { - for (String folder : SEAM_HOME_FOLDER_OPTIONS) { - File seamFile = new File(serverDefinition.getLocation(),folder); //$NON-NLS-1$ - addSeam(map, serverDefinition, seamFile); - } - } if (SEAM.equals(type)) { addSeam(map, serverDefinition, serverDefinition.getLocation()); } + initializeRuntimes(serverDefinition.getIncludedServerDefinitions()); } // Initialize Seam Runtime from JBoss EAP @@ -269,6 +261,22 @@ return builder.toString(); } + public static void calculateIncludedServerDefinition( + ServerDefinition serverDefinition) { + for (String folder : IJBossRuntimePluginConstants.SEAM_HOME_FOLDER_OPTIONS) { + File seamFile = new File(serverDefinition.getLocation(),folder); //$NON-NLS-1$ + if (seamFile.exists() && seamFile.canRead() && seamFile.isDirectory()) { + String seamVersion = getSeamVersionFromManifest(seamFile.getAbsolutePath()); + if (seamVersion != null) { + String name = "Seam " + serverDefinition.getName() + " " + seamVersion; //$NON-NLS-1$ //$NON-NLS-2$ + ServerDefinition sd = new ServerDefinition(name, seamVersion, SEAM, seamFile.getAbsoluteFile()); + sd.setParent(serverDefinition); + serverDefinition.getIncludedServerDefinitions().add(sd); + } + } + } + } + @Override public boolean exists(ServerDefinition serverDefinition) { if (serverDefinition == null || serverDefinition.getLocation() == null) { @@ -281,4 +289,5 @@ String path = seamRoot.getAbsolutePath(); return seamExists(path); } + } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF 2011-04-03 16:52:26 UTC (rev 30248) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %BundleName Bundle-SymbolicName: org.jboss.tools.runtime.core;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.jboss.tools.runtime.core.RuntimeCoreActivator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/pom.xml =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/pom.xml 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/pom.xml 2011-04-03 16:52:26 UTC (rev 30248) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.runtime.core</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> \ No newline at end of file Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/AbstractRuntimeDetector.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/AbstractRuntimeDetector.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/AbstractRuntimeDetector.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -123,5 +123,12 @@ int p1 = this.getPriority(); int p2 = o.getPriority(); return p1 - p2; - } + } + + @Override + public void computeIncludedServerDefinition( + ServerDefinition serverDefinition) { + + } + } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetector.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetector.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetector.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -47,4 +47,6 @@ int getPriority(); void setPriority(int priority); + + void computeIncludedServerDefinition(ServerDefinition serverDefinition); } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/ServerDefinition.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/ServerDefinition.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/ServerDefinition.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -11,6 +11,8 @@ package org.jboss.tools.runtime.core.model; import java.io.File; +import java.util.ArrayList; +import java.util.List; /** * @author snjeza @@ -25,6 +27,8 @@ private String description; private boolean enabled = true; private RuntimePath runtimePath; + private List<ServerDefinition> includedServerDefinitions = new ArrayList<ServerDefinition>(); + private ServerDefinition parent; public ServerDefinition(String name, String version, String type, File location) { @@ -139,6 +143,16 @@ this.runtimePath = runtimePath; } + public List<ServerDefinition> getIncludedServerDefinitions() { + return includedServerDefinitions; + } + + public ServerDefinition getParent() { + return parent; + } + + public void setParent(ServerDefinition parent) { + this.parent = parent; + } - } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF 2011-04-03 16:52:26 UTC (rev 30248) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %BundleName Bundle-SymbolicName: org.jboss.tools.runtime.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.jboss.tools.runtime.ui.RuntimeUIActivator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml 2011-04-03 16:52:26 UTC (rev 30248) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.runtime.ui</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> \ No newline at end of file Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeContentProvider.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeContentProvider.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeContentProvider.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -12,7 +12,7 @@ import java.util.List; -import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.jboss.tools.runtime.core.model.ServerDefinition; @@ -20,14 +20,14 @@ * @author snjeza * */ -public class RuntimeContentProvider implements IStructuredContentProvider { +public class RuntimeContentProvider implements ITreeContentProvider { private List<ServerDefinition> serverDefinitions; public RuntimeContentProvider(List<ServerDefinition> serverDefinitions) { this.serverDefinitions = serverDefinitions; } - + public Object[] getElements(Object inputElement) { return serverDefinitions.toArray(); } @@ -40,4 +40,18 @@ serverDefinitions = (List<ServerDefinition>) newInput; } + public boolean hasChildren(Object element) { + return ((ServerDefinition) element).getIncludedServerDefinitions().size() > 0; + } + + @Override + public Object[] getChildren(Object parentElement) { + List<ServerDefinition> list = ((ServerDefinition) parentElement).getIncludedServerDefinitions(); + return list.toArray(); + } + + @Override + public Object getParent(Object element) { + return ((ServerDefinition) element).getParent(); + } } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -29,7 +29,8 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.PreferenceDialog; -import org.eclipse.jface.viewers.CheckboxTableViewer; +import org.eclipse.jface.viewers.CheckboxTreeViewer; +import org.eclipse.jface.viewers.TreeViewerColumn; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -39,8 +40,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.IMemento; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.WorkbenchException; @@ -89,6 +89,8 @@ private static final String SERVER_DEFINITION = "serverDefinition"; private static final String NAME = "name"; + + private static final String INCLUDED_DEFINITION = "included"; private static final String VERSION = "version"; @@ -101,7 +103,11 @@ private static final String ENABLED = "enabled"; public static final String FIRST_START = "firstStart"; //$NON-NLS-1$ + + public static final String PREFERENCES_VERSION = "version"; //$NON-NLS-1$ + private static final String RUNTIME_PREFERENCES_VERSION = "2"; //$NON-NLS-1$ + private List<RuntimePath> runtimePaths = new ArrayList<RuntimePath>(); private Set<IRuntimeDetector> runtimeDetectors; @@ -155,27 +161,28 @@ RuntimeUIActivator.getDefault().getLog().log(status); } - public static CheckboxTableViewer createRuntimeViewer(final List<RuntimePath> runtimePaths2, Composite composite, int heightHint) { + public static CheckboxTreeViewer createRuntimeViewer(final List<RuntimePath> runtimePaths2, Composite composite, int heightHint) { GridData gd; - CheckboxTableViewer viewer = CheckboxTableViewer.newCheckList(composite, SWT.V_SCROLL + CheckboxTreeViewer viewer = new CheckboxTreeViewer(composite, SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION | SWT.SINGLE); - Table table = viewer.getTable(); + + Tree tree = viewer.getTree(); gd = new GridData(GridData.FILL_BOTH); GC gc = new GC( composite); FontMetrics fontMetrics = gc.getFontMetrics( ); gc.dispose( ); gd.heightHint = Dialog.convertHeightInCharsToPixels(fontMetrics, heightHint); - table.setLayoutData(gd); - table.setHeaderVisible(true); - table.setLinesVisible(true); + tree.setLayoutData(gd); + tree.setHeaderVisible(true); + tree.setLinesVisible(true); - String[] columnNames = new String[] { "Name", "Version", "Type", "Location", "Description"}; - int[] columnWidths = new int[] {140, 50, 50, 245, 200}; + String[] columnNames = new String[] { "Name", "Version", "Type", "Location"}; + int[] columnWidths = new int[] {300, 100, 50, 200}; for (int i = 0; i < columnNames.length; i++) { - TableColumn tc = new TableColumn(table, SWT.LEFT); - tc.setText(columnNames[i]); - tc.setWidth(columnWidths[i]); + TreeViewerColumn tc = new TreeViewerColumn(viewer, SWT.NONE); + tc.getColumn().setText(columnNames[i]); + tc.getColumn().setWidth(columnWidths[i]); } viewer.setLabelProvider(new RuntimeLabelProvider()); @@ -191,7 +198,7 @@ return viewer; } - public static void refreshRuntimes(Shell shell, final List<RuntimePath> runtimePaths, final CheckboxTableViewer viewer, boolean needRefresh, int heightHint) { + public static void refreshRuntimes(Shell shell, final List<RuntimePath> runtimePaths, final CheckboxTreeViewer viewer, boolean needRefresh, int heightHint) { IRunnableWithProgress op = new IRunnableWithProgress() { @Override @@ -280,6 +287,8 @@ } Reader reader = new StringReader(runtimes); XMLMemento memento = XMLMemento.createReadRoot(reader); + String preferencesVersion = memento.getString(PREFERENCES_VERSION); + boolean computeIncluded = preferencesVersion == null; IMemento[] nodes = memento.getChildren(RUNTIME_PATH); for (IMemento node:nodes) { String path = node.getString(PATH); @@ -299,24 +308,48 @@ IMemento serverDefinitionsNode = node.getChild(SERVER_DEFINITIONS); IMemento[] sdNodes = serverDefinitionsNode.getChildren(SERVER_DEFINITION); for (IMemento sdNode:sdNodes) { - String name = sdNode.getString(NAME); - String version = sdNode.getString(VERSION); - String type = sdNode.getString(TYPE); - String location = sdNode.getString(LOCATION); - String description = sdNode.getString(DESCRIPTION); - boolean enabled = sdNode.getBoolean(ENABLED); - ServerDefinition serverDefinition = - new ServerDefinition(name, version, type, new File(location)); - serverDefinition.setDescription(description); - serverDefinition.setEnabled(enabled); + ServerDefinition serverDefinition = createServerDefinition(sdNode); serverDefinition.setRuntimePath(runtimePath); + IMemento includedDefinition = sdNode.getChild(INCLUDED_DEFINITION); + if (includedDefinition != null) { + IMemento[] includedNodes = includedDefinition + .getChildren(SERVER_DEFINITION); + for (IMemento includedNode : includedNodes) { + ServerDefinition included = createServerDefinition(includedNode); + included.setRuntimePath(runtimePath); + included.setParent(serverDefinition); + serverDefinition.getIncludedServerDefinitions().add( + included); + } + } runtimePath.getServerDefinitions().add(serverDefinition); } runtimePaths.add(runtimePath); - } + if (computeIncluded) { + for(ServerDefinition definition:getServerDefinitions()) { + Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getRuntimeDetectors(); + for (IRuntimeDetector detector:detectors) { + detector.computeIncludedServerDefinition(definition); + } + } + } } + private ServerDefinition createServerDefinition(IMemento node) { + String name = node.getString(NAME); + String version = node.getString(VERSION); + String type = node.getString(TYPE); + String location = node.getString(LOCATION); + String description = node.getString(DESCRIPTION); + boolean enabled = node.getBoolean(ENABLED); + ServerDefinition serverDefinition = + new ServerDefinition(name, version, type, new File(location)); + serverDefinition.setDescription(description); + serverDefinition.setEnabled(enabled); + return serverDefinition; + } + private static IEclipsePreferences getPreferences() { if (prefs == null) { prefs = new ConfigurationScope().getNode(PLUGIN_ID); @@ -331,21 +364,15 @@ XMLMemento memento = XMLMemento.createWriteRoot(RUNTIME_PATHS); Writer writer = null; try { + memento.putString(PREFERENCES_VERSION, RUNTIME_PREFERENCES_VERSION); for (RuntimePath runtimePath:runtimePaths) { IMemento runtimePathNode = memento.createChild(RUNTIME_PATH); runtimePathNode.putString(PATH, runtimePath.getPath()); runtimePathNode.putBoolean(SCAN_ON_EVERY_STAERTUP, runtimePath.isScanOnEveryStartup()); runtimePathNode.putString(TIMESTAMP, String.valueOf(runtimePath.getTimestamp())); - IMemento serverDefintionsNode = runtimePathNode.createChild(SERVER_DEFINITIONS); - for (ServerDefinition serverDefinition:runtimePath.getServerDefinitions()) { - IMemento sdNode = serverDefintionsNode.createChild(SERVER_DEFINITION); - sdNode.putString(NAME, serverDefinition.getName()); - sdNode.putString(VERSION, serverDefinition.getVersion()); - sdNode.putString(TYPE, serverDefinition.getType()); - sdNode.putString(LOCATION, serverDefinition.getLocation().getAbsolutePath()); - sdNode.putString(DESCRIPTION, serverDefinition.getDescription()); - sdNode.putBoolean(ENABLED, serverDefinition.isEnabled()); - } + IMemento serverDefinitionsNode = runtimePathNode.createChild(SERVER_DEFINITIONS); + List<ServerDefinition> definitions = runtimePath.getServerDefinitions(); + putDefinitions(serverDefinitionsNode, definitions); } writer = new StringWriter(); memento.save(writer); @@ -366,6 +393,29 @@ } } + private void putDefinitions(IMemento serverDefintionsNode, + List<ServerDefinition> definitions) { + for (ServerDefinition serverDefinition:definitions) { + IMemento sdNode = serverDefintionsNode.createChild(SERVER_DEFINITION); + putServerDefinition(serverDefinition, sdNode); + IMemento includedNodes = sdNode.createChild(INCLUDED_DEFINITION); + for (ServerDefinition included:serverDefinition.getIncludedServerDefinitions()) { + IMemento includedNode = includedNodes.createChild(SERVER_DEFINITION); + putServerDefinition(included, includedNode); + } + } + } + + private void putServerDefinition(ServerDefinition serverDefinition, + IMemento node) { + node.putString(NAME, serverDefinition.getName()); + node.putString(VERSION, serverDefinition.getVersion()); + node.putString(TYPE, serverDefinition.getType()); + node.putString(LOCATION, serverDefinition.getLocation().getAbsolutePath()); + node.putString(DESCRIPTION, serverDefinition.getDescription()); + node.putBoolean(ENABLED, serverDefinition.isEnabled()); + } + public List<RuntimePath> getRuntimePaths() { if (runtimePaths == null) { try { Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.CheckboxTableViewer; +import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -45,7 +45,7 @@ private RuntimePath runtimePath; private List<RuntimePath> runtimePaths; - private CheckboxTableViewer tableViewer; + private CheckboxTreeViewer treeViewer; public EditRuntimePathDialog(Shell parentShell, RuntimePath runtimePath) { super(parentShell); @@ -115,7 +115,7 @@ @Override public void widgetSelected(SelectionEvent e) { - RuntimeUIActivator.refreshRuntimes(getShell(), getRuntimePaths(), tableViewer, false, 15); + RuntimeUIActivator.refreshRuntimes(getShell(), getRuntimePaths(), treeViewer, false, 15); } }); @@ -133,8 +133,8 @@ refreshButton.setEnabled( (new File(pathText.getText()).isDirectory()) ); List<RuntimePath> runtimePaths = getRuntimePaths(); - tableViewer = RuntimeUIActivator.createRuntimeViewer(runtimePaths, contents, 100); - tableViewer.addCheckStateListener(new ICheckStateListener() { + treeViewer = RuntimeUIActivator.createRuntimeViewer(runtimePaths, contents, 100); + treeViewer.addCheckStateListener(new ICheckStateListener() { @Override public void checkStateChanged(CheckStateChangedEvent event) { Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -20,12 +20,12 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.CheckboxTableViewer; +import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ColumnViewerEditor; import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent; import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy; import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.viewers.TableViewerEditor; +import org.eclipse.jface.viewers.TreeViewerEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.TreeItem; import org.jboss.tools.runtime.core.RuntimeCoreActivator; import org.jboss.tools.runtime.core.model.IRuntimeDetector; import org.jboss.tools.runtime.core.model.RuntimePath; @@ -53,7 +53,7 @@ private List<RuntimePath> runtimePaths = new ArrayList<RuntimePath>(); private boolean running = true; - private CheckboxTableViewer tableViewer; + private CheckboxTreeViewer treeViewer; private boolean canceled; private boolean needRefresh; private Label foundRuntimesLabel; @@ -115,8 +115,8 @@ // Only set for backwards compatibility taskLabel = messageLabel; - tableViewer = RuntimeUIActivator.createRuntimeViewer(runtimePaths, composite, heightHint); - tableViewer.addCheckStateListener(new ICheckStateListener() { + treeViewer = RuntimeUIActivator.createRuntimeViewer(runtimePaths, composite, heightHint); + treeViewer.addCheckStateListener(new ICheckStateListener() { @Override public void checkStateChanged(CheckStateChangedEvent event) { @@ -133,7 +133,7 @@ } }); - ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(tableViewer) { + ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(treeViewer) { protected boolean isEditorActivationEvent( ColumnViewerEditorActivationEvent event) { return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL @@ -142,7 +142,7 @@ } }; - TableViewerEditor.create(tableViewer, actSupport, + TreeViewerEditor.create(treeViewer, actSupport, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR | ColumnViewerEditor.TABBING_VERTICAL @@ -209,21 +209,24 @@ private void refresh(String message) { running = false; - tableViewer.setInput(null); + treeViewer.setInput(null); List<ServerDefinition> serverDefinitions = getServerDefinitions(hideCreatedRuntimes.getSelection()); - tableViewer.setInput(serverDefinitions); + treeViewer.setInput(serverDefinitions); for (ServerDefinition definition:serverDefinitions) { - tableViewer.setChecked(definition, definition.isEnabled()); + treeViewer.setChecked(definition, definition.isEnabled()); + for (ServerDefinition included:definition.getIncludedServerDefinitions()) { + treeViewer.setChecked(included, included.isEnabled()); + } } - TableItem[] tableItems = tableViewer.getTable().getItems(); - for (TableItem tableItem:tableItems) { - Object data = tableItem.getData(); + TreeItem[] treeItems = treeViewer.getTree().getItems(); + for (TreeItem treeItem:treeItems) { + Object data = treeItem.getData(); if (data instanceof ServerDefinition) { ServerDefinition serverDefinition = (ServerDefinition) data; boolean exists = RuntimeUIActivator.runtimeExists(serverDefinition); if (exists) { - tableItem.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY)); - tableViewer.setChecked(serverDefinition, serverDefinition.isEnabled()); + treeItem.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY)); + treeViewer.setChecked(serverDefinition, serverDefinition.isEnabled()); } } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF 2011-04-03 16:52:26 UTC (rev 30248) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %BundleName Bundle-SymbolicName: org.jboss.tools.runtime.test;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.3.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.junit4, org.jboss.tools.runtime, Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2011-04-03 16:52:26 UTC (rev 30248) @@ -8,7 +8,7 @@ </parent> <groupId>org.jboss.tools.runtime.tests</groupId> <artifactId>org.jboss.tools.runtime.test</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/IRuntimeDetectionConstants.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/IRuntimeDetectionConstants.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/IRuntimeDetectionConstants.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -19,11 +19,11 @@ final static String JBOSS_42_HOME = System.getProperty("jbosstools.test.jboss.home.4.2", "E:\\JBossRuntimes\\jboss-4.2.3.GA"); - final static String JBOSS_51_HOME = System.getProperty("jbosstools.test.jboss.home.5.1", "E:\\JBossRuntimes\\jboss-5.1.0.GA"); + final static String JBOSS_51_HOME = System.getProperty("jbosstools.test.jboss.home.5.1", "E:\\JBossRuntime2\\jboss-5.1.0.GA"); final static String SEAM_20_HOME = System.getProperty("jbosstools.test.seam.2.0.1.GA.home", "E:\\JBossRuntimes\\jboss-seam-2.0.1.GA"); - final static String SEAM_22_HOME = System.getProperty("jbosstools.test.seam.2.2.0.GA.home", "E:\\jboss-seam-2.2.1.Final"); + final static String SEAM_22_HOME = System.getProperty("jbosstools.test.seam.2.2.0.GA.home", "E:\\JBossRuntime2\\jboss-seam-2.2.1.Final"); final static String EAP_43_HOME = System.getProperty("jbosstools.test.eap.4.3.home", "E:\\jboss-eap43_cp03"); Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java 2011-04-03 16:51:43 UTC (rev 30247) +++ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java 2011-04-03 16:52:26 UTC (rev 30248) @@ -15,17 +15,29 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.jar.Attributes; import java.util.jar.JarFile; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IRuntimeType; import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.tools.runtime.IJBossRuntimePluginConstants; import org.jboss.tools.runtime.core.JBossRuntimeLocator; import org.jboss.tools.runtime.core.RuntimeCoreActivator; import org.jboss.tools.runtime.core.model.IRuntimeDetector; @@ -37,13 +49,19 @@ import org.jboss.tools.seam.core.project.facet.SeamVersion; import org.junit.BeforeClass; import org.junit.Test; +import org.osgi.framework.Bundle; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; /** * * @author snjeza * */ -public class RuntimeDetectionTest { +public class RuntimeDetectionTest implements IJBossRuntimePluginConstants { private final static String seamVersionAttributeName = "Seam-Version"; @BeforeClass @@ -289,4 +307,79 @@ assertTrue("runtimes.length\nExpected: 3\nWas: " + runtimes.length, runtimes.length == 3); } + + @Test + public void testIncludedDefinitions() { + for (ServerDefinition serverDefinition:RuntimeUIActivator.getDefault().getServerDefinitions()){ + String type = serverDefinition.getType(); + if (EAP.equals(type)) { + assertTrue("EAP has to include server definitions", serverDefinition.getIncludedServerDefinitions().size() > 0); + for(ServerDefinition included:serverDefinition.getIncludedServerDefinitions()) { + assertTrue("Invalid parent definition", included.getParent() == serverDefinition); + } + } + } + } + + @Test + public void testSavePreferences() throws Exception { + // saves preferences + Bundle bundle = Platform.getBundle(RuntimeUIActivator.PLUGIN_ID); + bundle.stop(); + // loads preferences + bundle.start(); + // calls tests again + testServerDefinitions(); + testIncludedDefinitions(); + testRuntimePaths(); + testRuntimeDetectors(); + testLocations(); + testSeamRuntimes(); + testWtpRuntimes(); + testSeam22(); + testSeam22Location(); + } + + @Test + public void testOldWorkspace() throws Exception { + String runtimes = ConfigurationScope.INSTANCE.getNode( + RuntimeUIActivator.PLUGIN_ID).get( + RuntimeUIActivator.RUNTIME_PATHS, null); + // removes version and included definitions + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + Document doc = factory.newDocumentBuilder().parse(new InputSource(new StringReader(runtimes))); + Element runtimePaths = (Element) doc.getElementsByTagName(RuntimeUIActivator.RUNTIME_PATHS).item(0); + runtimePaths.removeAttribute(RuntimeUIActivator.PREFERENCES_VERSION); + removeIncluded(doc); + runtimes = serialize(doc); + // restarts the bundle + Bundle bundle = Platform.getBundle(RuntimeUIActivator.PLUGIN_ID); + bundle.stop(); + bundle.start(); + // saves preferences + ConfigurationScope.INSTANCE.getNode(RuntimeUIActivator.PLUGIN_ID).put( + RuntimeUIActivator.RUNTIME_PATHS, runtimes); + // calls tests again + testIncludedDefinitions(); + testServerDefinitions(); + } + + private void removeIncluded(Node node) { + if (node.getNodeType() == Node.ELEMENT_NODE + && node.getNodeName().equals("included")) { + node.getParentNode().removeChild(node); + } else { + NodeList list = node.getChildNodes(); + for (int i = 0; i < list.getLength(); i++) { + removeIncluded(list.item(i)); + } + } + } + + private String serialize(Document doc) throws TransformerException { + StringWriter stringWriter = new StringWriter(); + Transformer serializer = TransformerFactory.newInstance().newTransformer(); + serializer.transform(new DOMSource(doc), new StreamResult(stringWriter)); + return stringWriter.toString(); + } }

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r30247 - in trunk/runtime/features: org.jboss.tools.runtime.feature and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-04-03 12:51:43 -0400 (Sun, 03 Apr 2011) New Revision: 30247 Modified: trunk/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml trunk/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml trunk/runtime/features/org.jboss.tools.runtime.feature/feature.xml trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml Log: JBIDE-8128 [JBossTools Runtimes] Allow user to select what runtime types to be added Modified: trunk/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml 2011-04-03 15:00:52 UTC (rev 30246) +++ trunk/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml 2011-04-03 16:51:43 UTC (rev 30247) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.runtime.core.feature" label="%featureName" - version="1.0.0.qualifier" + version="1.3.0.qualifier" provider-name="%providerName" plugin="org.jboss.tools.runtime.core"> Modified: trunk/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml 2011-04-03 15:00:52 UTC (rev 30246) +++ trunk/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml 2011-04-03 16:51:43 UTC (rev 30247) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.runtime.core.feature</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> \ No newline at end of file Modified: trunk/runtime/features/org.jboss.tools.runtime.feature/feature.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.feature/feature.xml 2011-04-03 15:00:52 UTC (rev 30246) +++ trunk/runtime/features/org.jboss.tools.runtime.feature/feature.xml 2011-04-03 16:51:43 UTC (rev 30247) @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.runtime.feature" - label="%featureName" - version="1.2.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.tools.runtime"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <plugin - id="org.jboss.tools.runtime" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.runtime.feature" + label="%featureName" + version="1.3.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.runtime"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <plugin + id="org.jboss.tools.runtime" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml 2011-04-03 15:00:52 UTC (rev 30246) +++ trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml 2011-04-03 16:51:43 UTC (rev 30247) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.runtime.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> \ No newline at end of file

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r30246 - in trunk/maven/plugins/org.jboss.tools.maven.core: src/org/jboss/tools/maven/core and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-04-03 11:00:52 -0400 (Sun, 03 Apr 2011) New Revision: 30246 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java Log: JBIDE-8536 Upgrade JBoss Maven Integration feature to use m2eclipse 0.13.x Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2011-04-02 18:55:30 UTC (rev 30245) +++ trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2011-04-03 15:00:52 UTC (rev 30246) @@ -23,7 +23,6 @@ org.eclipse.ui.workbench;visibility:=reexport, org.eclipse.m2e.model.edit;bundle-version="0.13.0";visibility:=reexport, org.eclipse.core.expressions, - org.slf4j.api;bundle-version="1.5.11";visibility:=reexport, org.maven.ide.eclipse.wtp;bundle-version="0.13.0";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2011-04-02 18:55:30 UTC (rev 30245) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2011-04-03 15:00:52 UTC (rev 30246) @@ -78,7 +78,7 @@ */ public class MavenCoreActivator extends Plugin { - private static final String ROOT_DIR = "/"; + private static final String ROOT_DIR = "/"; //$NON-NLS-1$ public static final String SEPARATOR = "/"; //$NON-NLS-1$

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r30245 - trunk/maven/features/org.jboss.tools.maven.project.examples.feature.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-04-02 14:55:30 -0400 (Sat, 02 Apr 2011) New Revision: 30245 Modified: trunk/maven/features/org.jboss.tools.maven.project.examples.feature/feature.xml Log: JBIDE-8536 Upgrade JBoss Maven Integration feature to use m2eclipse 0.13.x Modified: trunk/maven/features/org.jboss.tools.maven.project.examples.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.project.examples.feature/feature.xml 2011-04-02 18:55:21 UTC (rev 30244) +++ trunk/maven/features/org.jboss.tools.maven.project.examples.feature/feature.xml 2011-04-02 18:55:30 UTC (rev 30245) @@ -19,9 +19,9 @@ </license> <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.jboss.tools.project.examples.feature" version="1.2.0" match="greaterOrEqual"/> + <import feature="org.eclipse.m2e.feature" version="0.13.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.13.0" match="greaterOrEqual"/> + <import feature="org.jboss.tools.project.examples.feature" version="1.2.0" match="greaterOrEqual"/> </requires> <plugin

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r30244 - in trunk/maven/features: org.jboss.tools.maven.feature and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-04-02 14:55:21 -0400 (Sat, 02 Apr 2011) New Revision: 30244 Modified: trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml Log: JBIDE-8536 Upgrade JBoss Maven Integration feature to use m2eclipse 0.13.x Modified: trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml 2011-04-02 00:17:41 UTC (rev 30243) +++ trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml 2011-04-02 18:55:21 UTC (rev 30244) @@ -19,10 +19,10 @@ </license> <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.eclipse.m2e.feature" version="0.13.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.13.0" match="greaterOrEqual"/> </requires> - + <plugin id="org.jboss.tools.maven.cdi" download-size="0" Modified: trunk/maven/features/org.jboss.tools.maven.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2011-04-02 00:17:41 UTC (rev 30243) +++ trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2011-04-02 18:55:21 UTC (rev 30244) @@ -19,8 +19,8 @@ </license> <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.eclipse.m2e.feature" version="0.13.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.13.0" match="greaterOrEqual"/> </requires> <plugin Modified: trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.xml 2011-04-02 00:17:41 UTC (rev 30243) +++ trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.xml 2011-04-02 18:55:21 UTC (rev 30244) @@ -19,8 +19,8 @@ </license> <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.eclipse.m2e.feature" version="0.13.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.13.0" match="greaterOrEqual"/> </requires> <plugin Modified: trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml 2011-04-02 00:17:41 UTC (rev 30243) +++ trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml 2011-04-02 18:55:21 UTC (rev 30244) @@ -19,8 +19,8 @@ </license> <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.eclipse.m2e.feature" version="0.13.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.13.0" match="greaterOrEqual"/> </requires> <plugin Modified: trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml 2011-04-02 00:17:41 UTC (rev 30243) +++ trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml 2011-04-02 18:55:21 UTC (rev 30244) @@ -19,8 +19,8 @@ </license> <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.eclipse.m2e.feature" version="0.13.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.13.0" match="greaterOrEqual"/> </requires> <plugin Modified: trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2011-04-02 00:17:41 UTC (rev 30243) +++ trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2011-04-02 18:55:21 UTC (rev 30244) @@ -19,8 +19,8 @@ </license> <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.eclipse.m2e.feature" version="0.13.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.13.0" match="greaterOrEqual"/> </requires> <plugin

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r30243 - in trunk/vpe/tests/org.jboss.tools.vpe.docbook.test: src/org/jboss/tools/vpe/docbook/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-04-01 20:17:41 -0400 (Fri, 01 Apr 2011) New Revision: 30243 Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java Log: https://issues.jboss.org/browse/JBIDE-8652 VPE junit test hang ups fix for compilation errors in vpe.docbook.test plugin Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/META-INF/MANIFEST.MF 2011-04-01 23:34:59 UTC (rev 30242) +++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/META-INF/MANIFEST.MF 2011-04-02 00:17:41 UTC (rev 30243) @@ -11,7 +11,9 @@ org.jboss.tools.common.model, org.jboss.tools.vpe.xulrunner, org.junit, - org.jboss.tools.vpe.docbook;bundle-version="3.1.0" + org.jboss.tools.vpe.docbook;bundle-version="3.1.0", + org.jboss.tools.vpe.base.test;bundle-version="1.0.0", + org.eclipse.wst.xml.ui;bundle-version="1.1.200" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.vpe.docbook.test Bundle-Vendor: %Bundle-Vendor.0 Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookAllTests.java 2011-04-01 23:34:59 UTC (rev 30242) +++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookAllTests.java 2011-04-02 00:17:41 UTC (rev 30243) @@ -10,11 +10,11 @@ ******************************************************************************/ package org.jboss.tools.vpe.docbook.test; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; - import junit.framework.Test; import junit.framework.TestSuite; +import org.jboss.tools.vpe.base.test.VpeTestSetup; + /** * Class for testing all Docbook components * Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java 2011-04-01 23:34:59 UTC (rev 30242) +++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java 2011-04-02 00:17:41 UTC (rev 30243) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.docbook.test; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * Tests for the context that was generated by Docbook templates

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r30242 - in trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test: projects/CDISolderTest/src/org/jboss/requires and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-04-01 19:34:59 -0400 (Fri, 01 Apr 2011) New Revision: 30242 Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bear.java trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bee.java trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Dragonfly.java trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Flower.java trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Fly.java trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lion.java trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lynx.java trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/Tiger.java trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/package-info.java trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.java Log: JBIDE-3120 https://issues.jboss.org/browse/JBIDE-3120 JBIDE-8196 https://issues.jboss.org/browse/JBIDE-8196 JBIDE-8197 https://issues.jboss.org/browse/JBIDE-8197 Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bear.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bear.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bear.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -0,0 +1,10 @@ +package org.jboss.requires; + +import org.jboss.seam.solder.core.Requires; +import javax.inject.Named; + +@Requires("org.jboss.requires.Beehive") +@Named("bear") +public class Bear { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bear.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bee.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bee.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bee.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -0,0 +1,11 @@ +package org.jboss.requires; + +import javax.inject.Named; + +import org.jboss.seam.solder.core.Requires; + +@Requires({"org.jboss.requires.Beehive", "org.jboss.requires.Flower"}) +@Named("bee") +public class Bee { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bee.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Dragonfly.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Dragonfly.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Dragonfly.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -0,0 +1,11 @@ +package org.jboss.requires; + +import javax.inject.Named; + +import org.jboss.seam.solder.core.Requires; + +@Requires({"org.jboss.requires.Fly", "org.jboss.requires.Flower"}) +@Named("dragonfly") +public class Dragonfly { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Dragonfly.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Flower.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Flower.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Flower.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -0,0 +1,5 @@ +package org.jboss.requires; + +public class Flower { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Flower.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Fly.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Fly.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Fly.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -0,0 +1,11 @@ +package org.jboss.requires; + +import javax.inject.Named; + +import org.jboss.seam.solder.core.Requires; + +@Requires("org.jboss.requires.Flower") +@Named +public class Fly { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Fly.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lion.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lion.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lion.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -0,0 +1,11 @@ +package org.jboss.somevetoed; + +import javax.inject.Named; + +import org.jboss.seam.solder.core.Veto; + +@Veto +@Named("lion") +public class Lion { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lion.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lynx.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lynx.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lynx.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -0,0 +1,8 @@ +package org.jboss.somevetoed; + +import javax.inject.Named; + +@Named +public class Lynx { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lynx.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/Tiger.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/Tiger.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/Tiger.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -0,0 +1,8 @@ +package org.jboss.vetoed; + +import javax.inject.Named; + +@Named("tiger") +public class Tiger { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/Tiger.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/package-info.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/package-info.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/package-info.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -0,0 +1,5 @@ +@Veto +package org.jboss.vetoed; + +import org.jboss.seam.solder.core.Veto; + Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/package-info.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.java 2011-04-01 23:19:39 UTC (rev 30241) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -26,6 +26,7 @@ TestSuite suiteAll = new TestSuite("CDI Solder Core Tests"); suiteAll.addTestSuite(BeanNamingTest.class); + suiteAll.addTestSuite(VetoTest.class); return suiteAll; } Added: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java 2011-04-01 23:34:59 UTC (rev 30242) @@ -0,0 +1,114 @@ +package org.jboss.tools.cdi.solder.core.test; + + +import java.io.IOException; +import java.util.Set; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.IAnnotationDeclaration; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class VetoTest extends TestCase { + protected static String PLUGIN_ID = "org.jboss.tools.cdi.solder.core.test"; + IProject project = null; + + public VetoTest() {} + + public void setUp() throws Exception { + project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDISolderTest"); + JobUtils.waitForIdle(); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + + public void testVeto() throws CoreException, IOException { + ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); + + //1. package annotated @Veto; class is not annotated with it + TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.vetoed.Tiger"); + assertNotNull(d); //Though there exists Java type Tiger + IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + assertNotNull(a); + Object name = a.getMemberValue(null); + assertEquals("tiger", name); //...and it is annotated with @Named("tiger") + Set<IBean> bs = cdi.getBeans("tiger", false); + assertTrue(bs.isEmpty()); //...CDI model does not have bean named "tiger" + bs = cdi.getBeans(d.getResource().getFullPath()); + assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource + + //2. class annotated @Veto + d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.somevetoed.Lion"); + assertNotNull(d); //Though there exists Java type Lion + a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + assertNotNull(a); + name = a.getMemberValue(null); + assertEquals("lion", name); //...and it is annotated with @Named("lion") + bs = cdi.getBeans("lion", false); + assertTrue(bs.isEmpty()); //...CDI model does not have bean named "lion" + bs = cdi.getBeans(d.getResource().getFullPath()); + assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource + } + + public void testRequires() throws CoreException, IOException { + ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); + + //1. class annotated @Requires that references single non-available class + TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bear"); + assertNotNull(d); //Though there exists Java type Bear + IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + assertNotNull(a); + Object name = a.getMemberValue(null); + assertEquals("bear", name); //...and it is annotated with @Named("bear") + Set<IBean> bs = cdi.getBeans("bear", false); + assertTrue(bs.isEmpty()); //...CDI model does not have bean named "bear" + bs = cdi.getBeans(d.getResource().getFullPath()); + assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource + + //2. class annotated @Requires that references array of classes some of which are not available + d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bee"); + assertNotNull(d); //Though there exists Java type Bee + a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + assertNotNull(a); + name = a.getMemberValue(null); + assertEquals("bee", name); //...and it is annotated with @Named("bee") + bs = cdi.getBeans("bee", false); + assertTrue(bs.isEmpty()); //...CDI model does not have bean named "bee" + bs = cdi.getBeans(d.getResource().getFullPath()); + assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource + + //3. class annotated @Requires that references single available class + bs = cdi.getBeans("fly", false); + assertTrue(!bs.isEmpty()); //...CDI model have a bean named "fly" + + //4. class annotated @Requires that references array of available classes + bs = cdi.getBeans("dragonfly", false); + assertTrue(!bs.isEmpty()); //...CDI model have a bean named "dragonfly" + + } + + public void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + project.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + JobUtils.waitForIdle(); + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r30241 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-04-01 19:19:39 -0400 (Fri, 01 Apr 2011) New Revision: 30241 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java Log: JBIDE-3120 https://issues.jboss.org/browse/JBIDE-3120 JBIDE-8196 https://issues.jboss.org/browse/JBIDE-8196 JBIDE-8197 https://issues.jboss.org/browse/JBIDE-8197 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-04-01 23:18:12 UTC (rev 30240) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-04-01 23:19:39 UTC (rev 30241) @@ -31,6 +31,7 @@ import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IScopeDeclaration; +import org.jboss.tools.cdi.internal.core.impl.JavaAnnotation; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; import org.jboss.tools.common.EclipseUtil; @@ -116,7 +117,9 @@ Iterator<IScopeDeclaration> iter = scopDeclarations.iterator(); while(iter.hasNext()){ IScopeDeclaration declaration = iter.next(); - return declaration.getDeclaration(); + if(declaration instanceof JavaAnnotation) { + return ((JavaAnnotation)declaration).getAnnotation(); + } } return null; }

13 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits April 2011