JBoss Tools SVN: r25421 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-01 21:27:29 -0400 (Fri, 01 Oct 2010)
New Revision: 25421
Modified:
trunk/build/target-platform/README.txt
Log:
add -aPrz flag to rsync for better feedback/performance
Modified: trunk/build/target-platform/README.txt
===================================================================
--- trunk/build/target-platform/README.txt 2010-10-02 00:32:13 UTC (rev 25420)
+++ trunk/build/target-platform/README.txt 2010-10-02 01:27:29 UTC (rev 25421)
@@ -24,7 +24,7 @@
2. Push to qa01
- rsync e361-wtp322.target.zip nboldt@qa01:~/
+ rsync -aPrz e361-wtp322.target.zip nboldt@qa01:~/
3. Ssh to qa01; sudo to hudson; unpack and push contents + zip to download.jboss.org
13 years, 7 months
- 1
- 0
JBoss Tools SVN: r25420 - branches/jbosstools-3.2.0.Beta1/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-01 20:32:13 -0400 (Fri, 01 Oct 2010)
New Revision: 25420
Added:
branches/jbosstools-3.2.0.Beta1/build/target-platform/README.txt
branches/jbosstools-3.2.0.Beta1/build/target-platform/contentXml2artifactVersions.xsl
branches/jbosstools-3.2.0.Beta1/build/target-platform/e361-wtp322.target
branches/jbosstools-3.2.0.Beta1/build/target-platform/e361-wtp322.target.p2mirror.xml
branches/jbosstools-3.2.0.Beta1/build/target-platform/target2p2mirror.xml
branches/jbosstools-3.2.0.Beta1/build/target-platform/target2p2mirrorXml.xsl
branches/jbosstools-3.2.0.Beta1/build/target-platform/target2targetTemplate.xsl
branches/jbosstools-3.2.0.Beta1/build/target-platform/targetUpdateFromRepo.xml
Removed:
branches/jbosstools-3.2.0.Beta1/build/target-platform/install.xml
branches/jbosstools-3.2.0.Beta1/build/target-platform/target2ant.xsl
Modified:
branches/jbosstools-3.2.0.Beta1/build/target-platform/e36-wtp32.target
branches/jbosstools-3.2.0.Beta1/build/target-platform/pom.xml
Log:
switch to e361-wtp322 target platform; port from trunk into branch
Added: branches/jbosstools-3.2.0.Beta1/build/target-platform/README.txt
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/README.txt (rev 0)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/README.txt 2010-10-02 00:32:13 UTC (rev 25420)
@@ -0,0 +1,52 @@
+== HOWTO: Download the contents of a .target file to a local p2 repo on disk ==
+
+1. Run target2p2mirror.xml at a target file, eg.
+
+ ant -f target2p2mirror.xml -DtargetFile=e361-wtp322.target
+
+2. Run the resulting *.p2mirror.xml, eg., e361-wtp322.target.p2mirror.xml
+
+ /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data \
+ /tmp/workspace -consolelog -application \
+ org.eclipse.ant.core.antRunner -f e361-wtp322.target.p2mirror.xml \
+ -Ddebug=true \
+ -DfollowStrict=true \
+ -Drepo.dir=/tmp/REPO/
+
+3. Resulting repo can be added to Eclipse and from there, *uncategorized* features can be installed.
+
+
+== HOWTO: Publish local p2 repo (generated from .target) to download.jboss.org ==
+
+1. Zip the repo
+
+ cd /tmp/REPO; zip -9r e361-wtp322.target.zip *
+
+2. Push to qa01
+
+ rsync e361-wtp322.target.zip nboldt@qa01:~/
+
+3. Ssh to qa01; sudo to hudson; unpack and push contents + zip to download.jboss.org
+
+ sudo su - hudson
+ unzip /home/nboldt/e361-wtp322.target.zip -d /tmp/e361-wtp322.target
+ rsync -aPrz --rsh=ssh /tmp/e361-wtp322.target/* \
+ tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform/latest/
+ rsync -aPrz --rsh=ssh /home/nboldt/e361-wtp322.target.zip \
+ tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform
+
+
+== HOWTO: Update an existing .target file from newer versions of IUs in a repo ==
+
+1. Run targetUpdateFromRepo.xml against a given repo folder on disk, eg.
+
+ant -v -f targetUpdateFromRepo.xml -DtargetFile=e361-wtp322.target -DrepoDir=./REPO_SR1
+
+2. Resulting targetFile will be overwritten with updated version values from what was found in the
+ repo's content.xml file.
+
+
+== HOWTO: Install the contents of a repo into Eclipse (via script) ==
+
+1. See ../installation/README.txt
+
Added: branches/jbosstools-3.2.0.Beta1/build/target-platform/contentXml2artifactVersions.xsl
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/contentXml2artifactVersions.xsl (rev 0)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/contentXml2artifactVersions.xsl 2010-10-02 00:32:13 UTC (rev 25420)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<!--
+ This XSLT is used by targetUpdateFromRepo.xml to update the versions on IUs in a .target file
+ CAUTION: do not auto-format this file or line breaks will appear where they should not be!
+-->
+<xsl:output method="text" indent="no" encoding="UTF-8" version="1.0" />
+<xsl:template match="repository">
+<xsl:apply-templates select="//unit" />
+</xsl:template>
+<xsl:template match="//unit"><xsl:value-of select="@id" />.version=<xsl:value-of select="@version" />
+#
+</xsl:template>
+</xsl:stylesheet>
Modified: branches/jbosstools-3.2.0.Beta1/build/target-platform/e36-wtp32.target
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/e36-wtp32.target 2010-10-02 00:31:21 UTC (rev 25419)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/e36-wtp32.target 2010-10-02 00:32:13 UTC (rev 25420)
@@ -21,6 +21,12 @@
<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/subversive/0.7/weekly-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/subversive/0.7/headless-update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519..."/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -81,17 +87,11 @@
<unit id="org.eclipse.help.feature.group" version="1.2.0.v20100427-7e7jEKFEx2XlnZinYPtgz03"/>
<unit id="org.eclipse.jdt.feature.group" version="3.6.0.v20100526-0800-7z8XFUJFMTfCWGoVuHImpms9H155"/>
<unit id="org.eclipse.platform.feature.group" version="3.6.0.v20100602-9gF78GpqFt6trOGhL60z0oEx3fz-JKNwxPY"/>
-<unit id="org.eclipse.platform.ide" version="3.6.0.I20100608-0911"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.4.0.v20100524-7M7K-FIhIez-egBko15H73"/>
-<unit id="org.eclipse.equinox.executable" version="3.4.0.v20100524-7M7K-FIhIez-egBko15H73"/>
-<unit id="org.eclipse.platform.sdk" version="3.6.0.I20100608-0911"/>
<unit id="org.eclipse.pde.feature.group" version="3.6.0.v20100525-7b7mFKtFEx2XmfZ4_B7NUJA"/>
<unit id="org.eclipse.sdk.feature.group" version="3.6.0.v20100427-7Q7m-DPY2dP0s7TnP1vxqsprbrvrHJwHMVz0mb8mhRXmu"/>
<unit id="org.eclipse.rcp.feature.group" version="3.6.0.v20100519-9OArFKvFtsd7WLUKh-DcYTS"/>
-<unit id="org.eclipse.rcp.id" version="3.6.0.I20100608-0911"/>
-<unit id="org.eclipse.rcp.sdk.id" version="3.6.0.I20100608-0911"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
-<unit id="org.eclipse.sdk.ide" version="3.6.0.I20100608-0911"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.3.0.v20100527-817fFcfFEdcVbpRlgyBRcVX"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.0.v20100421-7V7RFisFNObpCoqow"/>
@@ -105,10 +105,9 @@
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.0.v20100503-7x7IFGFFT0z0-V-1UUj-XDpu"/>
<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL"/>
-<unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.I20100608-0911"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.0.v20100510-42A79oB5855K5E"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.6.x/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100617-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
@@ -138,7 +137,6 @@
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.0.v201005241510-7O7CFb3EMf84nP-FHuc10NTz--M3"/>
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.0.v201005241510-7H7AFUIDxumQGOb7ocjUR2Pvz-28"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.0.v201005241600-7S7WFAKFIpS---NRIS1pbfYBUIQ"/>
-<!-- <unit id="org.eclipse.jst.jsf.tests.feature.feature.group" version="3.2.0.v20100524-7E7W1FBBoPbPQIiTa3454"/> -->
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.0.v201005270528-7C78FGDF9JgLWLMBWz-Ose6"/>
<unit id="org.eclipse.jsf.feature.feature.group" version="3.2.0.v20100526-7E7I-F9JgLWLMBYy3114"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.0.v201005241530-5--AkF7B77NBZBgBg"/>
@@ -161,8 +159,8 @@
<unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.0.v201005241510-7E7AFHkAJrn5NL_6wTQDqKL5RwiQ"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.0.v201005241510-7I78FXbEtEoKvbtBtJ4fGNrH2oBH"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.0.v201005241510-7C7OFXTF7RZHQHHxO4IuKe"/>
-<!--repository location="http://download.eclipse.org/webtools/downloads/drops/R3.2.0/R-3.2.0-20100..."/ -->
-<repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/"/>
+<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.2.2/R-3.2.2-20100..."/>
+<!-- repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/"/ -->
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools/all..."/>
Added: branches/jbosstools-3.2.0.Beta1/build/target-platform/e361-wtp322.target
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/e361-wtp322.target (rev 0)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/e361-wtp322.target 2010-10-02 00:32:13 UTC (rev 25420)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+<target includeMode="feature" name="e36-wtp32">
+ <locations>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.2.20100623-1649"/>
+ <repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.10.0.20100209-0800"/>
+ <repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://eclipse.svnkit.com/1.3.x/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
+ </location>
+ <!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/subversive/0.7/headless-update-site/"/>
+</location> -->
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.eclipse.org/technology/subversive/0.7/weekly-site/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519..."/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="javax.wsdl.feature.feature.group" version="1.6.2.v201005080631"/>
+ <unit id="org.apache.oro.feature.feature.group" version="2.0.8.v201005080400"/>
+ <unit id="org.jdom.feature.feature.group" version="1.0.0.v201005080400"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/thirdparty/"/>
+ </location>
+ <!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.2"/>
+<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.2"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2/"/>
+</location> -->
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.12.v20100909-1551-H34-M2"/>
+ <unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.12.v20100909-1551-H34-M2"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.eclipse.org/tptp/updates/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="org.eclipse.emf.ecore.feature.group" version="2.6.1.v20100914-1218"/>
+ <unit id="org.eclipse.emf.feature.group" version="2.6.1.v20100914-1218"/>
+ <unit id="org.eclipse.emf.codegen.feature.group" version="2.6.0.v20100914-1218"/>
+ <unit id="org.eclipse.emf.common.feature.group" version="2.6.0.v20100914-1218"/>
+ <unit id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20100914-1218"/>
+ <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.6.1.v20100914-1218"/>
+ <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.6.0.v20100914-1218"/>
+ <unit id="org.eclipse.emf.ecore.editor.feature.group" version="2.6.0.v20100914-1218"/>
+ <unit id="org.eclipse.emf.ecore.feature.group" version="2.6.1.v20100914-1218"/>
+ <unit id="org.eclipse.emf.edit.feature.group" version="2.6.0.v20100914-1218"/>
+ <unit id="org.eclipse.xsd.feature.group" version="2.6.0.v20100914-1218"/>
+ <repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.595-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.595-dev-e36"/>
+ <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.595-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.595-dev-e36"/>
+ <unit id="org.eclipse.swtbot.feature.group" version="2.0.0.595-dev-e36"/>
+ <repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.1.v20100617a-57B185wFfAqPz0Ef8mBsMkG-0hfS"/>
+ <unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.1.v20100915-1750-35-7w31211A2602861"/>
+ <repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.0.v20100510-7K7QErDzbb9z-yqHb55T7I"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911"/>
+ <unit id="org.eclipse.help.feature.group" version="1.2.0.v20100427-7e7jEQFEp4jsWcboLU9l93"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.6.1.r361_v20100714-0800-7z8XFUSFLFlmgLc5z-Bvrt8-HVkH"/>
+ <unit id="org.eclipse.platform.feature.group" version="3.6.1.r361_v20100910-9gF78GroFrD9Uh-LhvxMFCV2hCz01p6896L"/>
+ <unit id="org.eclipse.platform.ide" version="3.6.1.M20100929-0800"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi"/>
+ <unit id="org.eclipse.equinox.executable" version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi"/>
+ <unit id="org.eclipse.platform.sdk" version="3.6.1.M20100909-0800"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ"/>
+ <unit id="org.eclipse.sdk.feature.group" version="3.6.1.r361_v20100714-0800-7Q7m6DDaKf5o53L9dz-d8n-yz-tWdHTE5xVLpsrf4c764"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.6.1.r361_v20100827-9OArFLdFjY-ThSQXmKvKz0_T"/>
+ <unit id="org.eclipse.rcp.id" version="3.6.0.M20100909-0800"/>
+ <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20100929-0800"/>
+ <unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
+ <unit id="org.eclipse.sdk.ide" version="3.6.1.M20100929-0800"/>
+ <unit id="org.eclipse.sdk.examples.feature.group" version="3.3.0.v20100527-817fFcfFEdcVcRZlgyBRcVX"/>
+ <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
+ <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.0.v20100421-7V7RFiwFLSgEt4Pctn77c7J"/>
+ <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.0.v20100603-7sF99FsHFTw8HQBta4g33J3F"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.0.v20100510-4--9oB5855K7P"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.0.v20100503-9I7VGAeG8tz-BY6jz0w2HLRYr"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.0.v20100421-7u7NFVgFN5JdPKPhDHd_6Yqc54uw"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20100903-7H7R07v8rtOZyYbv1I6aZgou5z07"/>
+ <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.0.v20100421-79--EVVFNFFsFc"/>
+ <unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
+ <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.0.v20100503-7x7IFGOFQ74dz0POCNUBjA6L"/>
+ <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL"/>
+ <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.M20100929-0800"/>
+ <unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.0.v20100510-42A79oB5855K5E"/>
+ <unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/3.6.x/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.0.v201005280400-7C7b8cEt1ZvsifWcrT8a-F-sz05R"/>
+ <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.0.v201005280400-7J8x0BWwUK6x2yoco_A-q71HMuLt"/>
+ <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.0.v201005280400-7P9i0FDxNYrk4QYG-9qpz0N-vbEp"/>
+ <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.0.v201005280400-2-07w31211518181A"/>
+ <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.0.v201005280400-77077CcNBGKBWJ_HWVi"/>
+ <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.1.v20100618-77778eBmKDNOMgJvJ8Of7QBR"/>
+ <unit id="org.eclipse.draw2d.feature.group" version="3.6.0.v20100519-2050-45-7w3121163602336"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.6.0.v20100519-2050-777B-81A2Bz-69793A8B83447"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-678-8yE4F-8HAH4DFEF3447"/>
+ <unit id="org.eclipse.uml2.feature.group" version="3.1.0.v201006071150"/>
+ <unit id="org.eclipse.rse.feature.group" version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ"/>
+ <repository location="http://download.eclipse.org/releases/helios/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="org.eclipse.jst.jee" version="1.0.301.v201007151900"/>
+ <unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/>
+ <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.102.v201008170019"/>
+ <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.2.v201008170019-377AB8s73533J5J759F"/>
+
+ <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.2.v201008232129-7H777DFAKlRiOX8lGdRoz0878J"/>
+ <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.2.v201008242310-7N7UF75FD3wTgbUpoff0aT"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.2.v201008170019-377AB8s73533J5H335L"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.2.v201008190400-7b7GHf2FSK2WBLQ2D-mrubYEOrRh"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.2.v201008100100-7O7CFbKEMf84nUlEJyX7-SPQjhYZ"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.2.v201008170029-7H7AFUQDxumQGOpBqffOY2f1qxDZ"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.2.v201009091745-7S7WFAPFIpS-1-NbCE6tnacCXKP"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.2.v201008170101-7C78FGMF9JgLWLMUUEMtXc"/>
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3"/>
+ <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.0.v201005241530-5--AkF7B77NBZBgBg"/>
+ <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.1.v201008232129-7E777CF8NcJSSK-UBTwXn"/>
+ <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.1.v201007070821-52FMTAkF7B77UBR7W98"/>
+ <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.2.2.v20100818b-777HFGRCcNBDiBjIbhBA8"/>
+ <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201005241530-208Z7w31211419"/>
+ <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.2.0.v201005241530-31FA28s73533C66"/>
+ <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.2.v20100908-7A5FEi9xFc7RCJMToAIOJC43A"/>
+ <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.2.v201008170029-7F77FJSC25Tkdy1nqglPjqLAoDgh"/>
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3"/>
+ <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.5.v201009091745-67K2BgJ9DIAXCbBWJO"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.1.v20100906-4609oB5855L6N"/>
+ <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.300.v201005241450-2407w312116191741"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.2.v201008091400-7B7DFElF7RZHOZJ6W0PsNJ"/>
+ <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.2.v201008091400-7C78FPhEdhO_mXde7kbap_K7X1Qt"/>
+ <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
+ <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.2.2.v20100908-30F8V8s734C3I3K"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.2.v20100908-7B4FBrAtJb1nESKmCJHPGQ347"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.2.v201008100100-7E7AFHwAJrn5PM15pUYBwJLkSG8j"/>
+ <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.2.v201008211705-7I78FZFEtEoO2c5BlJ4jPNvNC-yS"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.2.v201008170029-7C7OFXYF7RZHQHI5PyJwPT"/>
+ <repository location="http://download.eclipse.org/webtools/repository/helios/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools/all..."/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.3.3.v201006111317"/>
+ <repository location="http://dl.google.com/eclipse/plugin/3.6/"/>
+ </location>
+
+ <!-- additional JBoss.org mirrors -->
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/helios/"/>
+ </location>
+ </locations>
+ <includeBundles>
+ <feature id="org.drools.eclipse.feature"/>
+ <feature id="org.drools.eclipse.task.feature"/>
+ <feature id="org.guvnor.tools.feature"/>
+ <feature id="org.mozilla.xulrunner.feature"/>
+ <feature id="org.mozilla.xpcom.feature"/>
+ </includeBundles>
+ <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</target>
Added: branches/jbosstools-3.2.0.Beta1/build/target-platform/e361-wtp322.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/e361-wtp322.target.p2mirror.xml (rev 0)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-02 00:32:13 UTC (rev 25420)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xs="http://www.w3.org/2001/XMLSchema" default="download.target.platform" name="Download target platform">
+<target name="help">
+<echo>
+ Generated with useLatest = true
+
+ ---
+
+ Use followStrict="true" to prevent downloading all
+ requirements not included in the target platform
+ or
+ followStrict="false" to fetch everything
+
+ To run this script:
+
+ /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data \
+ /tmp/workspace -consolelog -application \
+ org.eclipse.ant.core.antRunner -f *.target.p2mirror.xml \
+ -Ddebug=true \
+ -DfollowStrict=true \
+ -Drepo.dir=/tmp/REPO/
+</echo>
+</target>
+<target unless="repo.dir" name="init">
+<fail>Must set -Drepo.dir=/abs/path/to/download/artifacts/</fail>
+</target>
+<target if="repo.dir" description="Download from target platform definition" depends="init" name="download.target.platform">
+<property value="false" name="verbose"/>
+<property value="false" name="followStrict"/>
+<echo level="info">Download features/plugins into ${repo.dir}</echo>
+<p2.mirror verbose="${verbose}" destination="file:${repo.dir}">
+<slicingOptions followStrict="${followStrict}" includeFeatures="true"/>
+<source>
+<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
+<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
+<repository location="http://eclipse.svnkit.com/1.3.x/"/>
+<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
+<repository location="http://download.eclipse.org/technology/subversive/0.7/weekly-site/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519..."/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/thirdparty/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/"/>
+<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
+<repository location="http://download.eclipse.org/tptp/updates/"/>
+<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.6.x/"/>
+<repository location="http://download.eclipse.org/releases/helios/"/>
+<repository location="http://download.eclipse.org/webtools/repository/helios/"/>
+<repository location="http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools/all..."/>
+<repository location="http://dl.google.com/eclipse/plugin/3.6/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/helios/"/>
+</source>
+<iu version="" id="org.maven.ide.eclipse.feature.feature.group"/>
+<iu version="" id="org.maven.ide.eclipse.wtp.feature.feature.group"/>
+<iu version="" id="javax.wsdl.feature.feature.group"/>
+<iu version="" id="org.apache.oro.feature.feature.group"/>
+<iu version="" id="org.jdom.feature.feature.group"/>
+<iu version="" id="org.mozilla.xulrunner.feature.feature.group"/>
+<iu version="" id="org.mozilla.xpcom.feature.feature.group"/>
+<iu version="" id="org.eclipse.emf.ecore.feature.group"/>
+<iu version="" id="org.eclipse.emf.feature.group"/>
+<iu version="" id="org.eclipse.emf.codegen.feature.group"/>
+<iu version="" id="org.eclipse.emf.common.feature.group"/>
+<iu version="" id="org.eclipse.emf.databinding.feature.group"/>
+<iu version="" id="org.eclipse.emf.codegen.ecore.feature.group"/>
+<iu version="" id="org.eclipse.emf.ecore.edit.feature.group"/>
+<iu version="" id="org.eclipse.emf.ecore.editor.feature.group"/>
+<iu version="" id="org.eclipse.emf.ecore.feature.group"/>
+<iu version="" id="org.eclipse.emf.edit.feature.group"/>
+<iu version="" id="org.eclipse.xsd.feature.group"/>
+<iu version="" id="org.eclipse.swtbot.eclipse.feature.group"/>
+<iu version="" id="org.eclipse.swtbot.eclipse.gef.feature.group"/>
+<iu version="" id="org.eclipse.swtbot.ide.feature.group"/>
+<iu version="" id="org.eclipse.swtbot.eclipse.test.junit4.feature.group"/>
+<iu version="" id="org.eclipse.swtbot.feature.group"/>
+<iu version="" id="org.eclipse.birt.osgi.runtime.sdk.feature.group"/>
+<iu version="" id="org.eclipse.birt.feature.group"/>
+<iu version="" id="org.eclipse.birt.integration.wtp.feature.group"/>
+<iu version="" id="com.ibm.icu.base.feature.group"/>
+<iu version="" id="org.eclipse.equinox.server.core.feature.group"/>
+<iu version="" id="org.eclipse.cvs.feature.group"/>
+<iu version="" id="org.eclipse.help.feature.group"/>
+<iu version="" id="org.eclipse.jdt.feature.group"/>
+<iu version="" id="org.eclipse.platform.feature.group"/>
+<iu version="" id="org.eclipse.platform.ide"/>
+<iu version="" id="org.eclipse.equinox.executable.feature.group"/>
+<iu version="" id="org.eclipse.equinox.executable"/>
+<iu version="" id="org.eclipse.platform.sdk"/>
+<iu version="" id="org.eclipse.pde.feature.group"/>
+<iu version="" id="org.eclipse.sdk.feature.group"/>
+<iu version="" id="org.eclipse.rcp.feature.group"/>
+<iu version="" id="org.eclipse.rcp.id"/>
+<iu version="" id="org.eclipse.rcp.sdk.id"/>
+<iu version="" id="org.eclipse.releng.tools.feature.group"/>
+<iu version="" id="org.eclipse.sdk.ide"/>
+<iu version="" id="org.eclipse.sdk.examples.feature.group"/>
+<iu version="" id="org.eclipse.sdk.examples.source.feature.group"/>
+<iu version="" id="org.eclipse.equinox.compendium.sdk.feature.group"/>
+<iu version="" id="org.eclipse.equinox.core.sdk.feature.group"/>
+<iu version="" id="org.eclipse.equinox.p2.discovery.feature.feature.group"/>
+<iu version="" id="org.eclipse.equinox.p2.user.ui.feature.group"/>
+<iu version="" id="org.eclipse.equinox.p2.sdk.feature.group"/>
+<iu version="" id="org.eclipse.equinox.serverside.sdk.feature.group"/>
+<iu version="" id="org.eclipse.equinox.sdk.feature.group"/>
+<iu version="" id="org.eclipse.equinox.weaving.sdk.feature.group"/>
+<iu version="" id="org.eclipse.equinox.server.jetty.feature.group"/>
+<iu version="" id="org.eclipse.equinox.server.p2.feature.group"/>
+<iu version="" id="org.eclipse.pde.api.tools.ee.fragments.feature.group"/>
+<iu version="" id="org.eclipse.equinox.p2.ui.admin.rcp.product"/>
+<iu version="" id="org.eclipse.equinox.server.servletbridge.feature.group"/>
+<iu version="" id="org.eclipse.equinox.server.simple.feature.group"/>
+<iu version="" id="org.eclipse.birt.feature.group"/>
+<iu version="" id="org.eclipse.datatools.connectivity.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sdk.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.jdt.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.modelbase.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group"/>
+<iu version="" id="org.eclipse.draw2d.feature.group"/>
+<iu version="" id="org.eclipse.gef.feature.group"/>
+<iu version="" id="org.eclipse.zest.feature.group"/>
+<iu version="" id="org.eclipse.uml2.feature.group"/>
+<iu version="" id="org.eclipse.rse.feature.group"/>
+<iu version="" id="org.eclipse.jst.jee"/>
+<iu version="" id="org.eclipse.wst.common.frameworks"/>
+<iu version="" id="org.eclipse.wst.common.project.facet.ui"/>
+<iu version="" id="org.eclipse.jst.jee.web"/>
+<iu version="" id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
+<iu version="" id="org.eclipse.jst.ws.axis2tools.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.ws.cxf.feature.feature.group"/>
+<iu version="" id="org.eclipse.jpt.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.common.fproj.feature.group"/>
+<iu version="" id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.web_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.xml_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.xsl.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.jsdt.feature.feature.group"/>
+<iu version="" id="org.eclipse.jsf.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.enterprise_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.server_adapters.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.server_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.server_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.web_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.jsf.feature.source.feature.group"/>
+<iu version="" id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.webpageeditor.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.ws_wsdl15.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.common_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.common_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.server_adapters.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.server_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.server_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.web_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.ws_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.xml_core.feature.feature.group"/>
+<iu version="" id="com.google.gdt.eclipse.suite.e36.feature.feature.group"/>
+<iu version="" id="org.drools.eclipse.feature.feature.group"/>
+<iu version="" id="org.drools.eclipse.task.feature.feature.group"/>
+<iu version="" id="org.guvnor.tools.feature.feature.group"/>
+<iu version="" id="org.mozilla.xulrunner.feature.feature.group"/>
+<iu version="" id="org.mozilla.xpcom.feature.feature.group"/>
+</p2.mirror>
+</target>
+</project>
Deleted: branches/jbosstools-3.2.0.Beta1/build/target-platform/install.xml
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/install.xml 2010-10-02 00:31:21 UTC (rev 25419)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/install.xml 2010-10-02 00:32:13 UTC (rev 25420)
@@ -1,172 +0,0 @@
-<project default="run" basedir="." name="Install a target platform into local Eclipse">
- <!-- To fetch a number of features remote repo(s) and mirror them locally, run this in target/platform dir:
-
- ~/eclipse/36clean/eclipse/eclipse -vm /opt/sun-java2-6.0/bin/java -nosplash \
- -data /tmp/workspace -consolelog -application org.eclipse.ant.core.antRunner \
- -f ./install.xml \
- -Dtarget.to.install=e36-wtp32.target \
- -Drepo.dir=/tmp/p2.mirror \
- -Dinstall.dir=/home/nboldt/eclipse/36clean2/eclipse \
- | tee log.txt
-
- ALTERNATIVE PLAN:
-
- generate metadata (content.xml) for file:/home/nboldt/eclipse/workspace-clean36/.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/
- install from there (already on disk)
- -->
-
- <!-- what target file to be installed -->
- <property name="target.to.install" value="e36-wtp32.target" />
-
- <!-- where to download and create mirror repo -->
- <property name="repo.dir" value="${java.io.tmpdir}/p2.mirror" />
-
- <!-- where to install target: into ${eclipse.home} or /path/to/eclipse -->
- <!-- <property name="install.dir" value="${eclipse.home}" /> -->
- <!-- <property name="install.dir" value="/home/nboldt/eclipse/36clean2/eclipse" /> -->
-
- <target name="init" unless="install.dir">
- <fail>Must set these properties:
- -Dtarget.to.install=e36-wtp32.target
- -Drepo.dir=${java.io.tmpdir}/p2.mirror
- -Dinstall.dir=/home/nboldt/eclipse/36clean2/eclipse
-</fail>
- </target>
-
- <target name="run" depends="init" if="install.dir">
- <mkdir dir="${repo.dir}" />
-
- <!-- create p2.mirror ant script -->
- <property name="mirror" value="${java.io.tmpdir}/p2.mirror.xml" />
- <xslt style="target2ant.xsl" in="${target.to.install}" out="${mirror}" force="true" />
-
- <!-- run generated p2.mirror ant script -->
- <ant antfile="p2.mirror.xml">
- <property name="repo.dir" value="${repo.dir}" />
- </ant>
-
- <!-- generate a site.xml for all the features available -->
- <antcall target="buildSiteXml" />
-
- <!-- TODO: delete existing metadata in ${repo.dir} before regenerating it? -->
- <delete dir="${repo.dir}" includes="artifacts.xml, artifacts.jar, content.xml, content.jar" />
-
- <!-- generate metadata -->
- <!-- TODO: switch to use Publisher: http://wiki.eclipse.org/Equinox/p2/Publisher#Features_and_Bundles_Publish...
- <p2.publish.featuresAndBundles
- metadataRepository="file:/repository/location"
- artifactRepository="file:/repository/location"
- publishArtifacts="true"
- compress="true"
- source="/bundles/and/features/location/">
- -->
- <java classname="org.eclipse.equinox.launcher.Main"
- fork="true"
- timeout="10800000"
- jvm="${java.home}/bin/java"
- failonerror="false"
- maxmemory="512m"
- taskname="p2"
- >
- <classpath>
- <fileset dir="${eclipse.home}/plugins"
- includes="org.eclipse.equinox.launcher_*.jar, org.eclipse.equinox.p2.metadata.generator_*.jar"
- />
- <pathelement location="${eclipse.home}/plugins" />
- </classpath>
- <arg line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" />
- <arg line=" -updateSite ${repo.dir}/ -site file:${repo.dir}/site.xml" />
- <arg line="-metadataRepository file://${repo.dir} -metadataRepositoryName "Local Mirror Repo"" />
- <arg line="-artifactRepository file://${repo.dir} -artifactRepositoryName "Local Mirror Artifacts""
- />
- <arg line="-compress -noDefaultIUs -reusePack200Files" />
- </java>
-
- <!-- cleanup -->
- <delete file="${mirror}" quiet="true" />
-
- <!-- run p2.director to install from repo.dir into install.dir -->
- <chmod perm="+x" file="${eclipse.home}/eclipse" />
- <exec executable="${eclipse.home}/eclipse"
- failonerror="true"
- dir="${eclipse.home}"
- timeout="900000"
- taskname="p2.dir"
- >
- <arg line=" -vm ${java.home}/bin/java" />
- <arg line=" -application org.eclipse.equinox.p2.director" />
- <arg line=" -nosplash --launcher.suppressErrors -consoleLog -flavor tooling -roaming -profile SDKProfile" />
- <!-- <arg line=" -installIU ... -installIU ... " /> -->
- <arg line=" -destination ${install.dir} -bundlepool ${install.dir}" />
- <arg line=" -metadataRepository file://${repo.dir} -artifactRepository file://${repo.dir}" />
- <arg line=" -profileProperties org.eclipse.update.install.features=true" />
- <arg line=" -vmargs -Declipse.p2.data.area=${install.dir}/p2 -Declipse.p2.MD5Check=false" />
- </exec>
- </target>
-
- <target name="buildSiteXml" description="Generate a site.xml to contain the features in a category">
- <echo level="info">Generating site.xml for use with p2 repo / update site categories...</echo>
- <echo file="${repo.dir}/site.xml"><?xml version="1.0" encoding="UTF-8"?></echo>
- <if>
- <equals arg1="${pack200Files}" arg2="-reusePack200Files" />
- <then>
- <echo append="true" file="${repo.dir}/site.xml"><site pack200="true"></echo>
- </then>
- <else>
- <echo append="true" file="${repo.dir}/site.xml"><site></echo>
- </else>
- </if>
-
- <property name="category.name" value="Subversive Repo" />
-
- <echo append="true" file="${repo.dir}/site.xml"> <description>To install these features, point Eclipse at this site.</description>
-
- <!-- ${category.name} -->
- <category-def label="${category.name}" name="${category.name}">
- <description>${category.name}: contains all features in this build.</description>
- </category-def>
- </echo>
-
- <for param="featureJar">
- <path>
- <fileset dir="${repo.dir}/features" includes="*.jar" />
- </path>
- <sequential>
- <var name="feature.jarfile" unset="true" />
- <var name="feature.id" unset="true" />
- <var name="feature.version" unset="true" />
- <propertyregex property="feature.jarfile"
- defaultvalue="@{featureJar}"
- input="@{featureJar}"
- regexp=".+/features/([^/]+\.jar)"
- replace="\1"
- override="true"
- />
- <propertyregex property="feature.id"
- defaultvalue="${feature.jarfile}"
- input="${feature.jarfile}"
- regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar"
- replace="\1"
- override="true"
- />
- <propertyregex property="feature.version"
- defaultvalue="${feature.jarfile}"
- input="${feature.jarfile}"
- regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar"
- replace="\2"
- override="true"
- />
- <echo append="true" file="${repo.dir}/site.xml"> <feature id="${feature.id}" version="${feature.version}" url="features/${feature.jarfile}" patch="false">
- <category name="${category.name}"/>
- </feature>
- </echo>
- <var name="feature.jarfile" unset="true" />
- <var name="feature.id" unset="true" />
- <var name="feature.version" unset="true" />
- </sequential>
- </for>
- <echo append="true" file="${repo.dir}/site.xml">
- </site>
- </echo>
- </target>
-</project>
Modified: branches/jbosstools-3.2.0.Beta1/build/target-platform/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/pom.xml 2010-10-02 00:31:21 UTC (rev 25419)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/pom.xml 2010-10-02 00:32:13 UTC (rev 25420)
@@ -2,16 +2,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-<!-- <parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent> -->
+ <!-- <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version> </parent> -->
<groupId>org.jboss.tools</groupId>
<artifactId>target-platform</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>JBoss Tools Target Platform Definition</name>
<packaging>pom</packaging>
+
+ <properties>
+ <targetFile>e361-wtp322.target</targetFile>
+ </properties>
<build>
<plugins>
@@ -30,7 +31,7 @@
<artifacts>
<!-- add more artifacts if want more target platforms -->
<artifact>
- <file>e36-wtp32.target</file>
+ <file>${targetFile}</file>
<type>target</type>
<classifier>e36-wtp32</classifier>
</artifact>
Deleted: branches/jbosstools-3.2.0.Beta1/build/target-platform/target2ant.xsl
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/target2ant.xsl 2010-10-02 00:31:21 UTC (rev 25419)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/target2ant.xsl 2010-10-02 00:32:13 UTC (rev 25420)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
- <xsl:output method="xml" indent="yes" encoding="UTF-8"
- version="1.0" />
- <xsl:decimal-format decimal-separator="."
- grouping-separator="," />
-
- <xsl:param name="verbose" select="'${verbose}'" />
- <xsl:param name="followStrict" select="'${followStrict}'" />
- <xsl:param name="destination" select="'file:${repo.dir}'" />
-
- <xsl:variable name="platformFilter"
- select="concat(/target/environment/os/text(), ',', /target/environment/ws/text(), ',', /target/environment/arch/text())" />
-
- <xsl:template match="target">
- <project name="Download target platform" default="download.target.platform">
- <target name="help">
- <echo>
- Use followStrict="true" to prevent downloading all
- requirements not included in the target platform
- or
- followStrict="false" to fetch everything
-
- To run this script:
-
- ./eclipse -vm /opt/jdk1.6.0/bin/java -nosplash
- -data \
- /tmp/workspace -consolelog -application \
- org.eclipse.ant.core.antRunner -f out.xml \
- -Ddebug=true \
- -DfollowStrict=false \
- -Drepo.dir=/tmp/REPO/
-</echo>
- </target>
- <target name="init" unless="repo.dir">
- <fail>Must set -Drepo.dir=/path/to/download/artifacts/</fail>
- </target>
- <target name="download.target.platform" depends="init"
- description="Download from target platform definition" if="repo.dir">
- <property name="verbose" value="false" />
- <property name="followStrict" value="false" />
- <echo level="info">Download features/plugins into ${repo.dir}</echo>
- <p2.mirror destination="{$destination}" verbose="{$verbose}">
- <slicingOptions includeFeatures="true" followStrict="{$followStrict}" />
- <source>
- <xsl:apply-templates select="//repository" />
- </source>
- <xsl:apply-templates select="//unit" />
- <xsl:apply-templates select="//feature" />
- <xsl:apply-templates select="//plugin" />
- </p2.mirror>
- </target>
- </project>
- </xsl:template>
-
- <xsl:template match="//repository">
- <xsl:variable name="locationUrl" select="./@location" />
- <repository location="{$locationUrl}" />
- </xsl:template>
-
- <xsl:template match="//unit">
- <iu id="{@id}" version="{@version}" />
- </xsl:template>
-
- <xsl:template match="//plugin">
- <iu id="{@id}" version="" />
- </xsl:template>
-
- <xsl:template match="//feature">
- <iu id="{(a)id}.feature.group" version="" />
- </xsl:template>
-
- <!-- ignore anything else -->
- <xsl:template match="environment|targetJRE|launcherArgs|includeBundles" />
-
-</xsl:stylesheet>
\ No newline at end of file
Added: branches/jbosstools-3.2.0.Beta1/build/target-platform/target2p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/target2p2mirror.xml (rev 0)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/target2p2mirror.xml 2010-10-02 00:32:13 UTC (rev 25420)
@@ -0,0 +1,29 @@
+<project default="custom.build" name="jbosstools target platform p2.mirror generator">
+ <property name="targetFile" value="e361-wtp322.target" />
+
+ <!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
+ if useLatest = false, include versions and fetch specific versions requested. -->
+ <property name="useLatest" value="true" />
+
+ <target name="custom.build" depends="gen.p2mirror.script" />
+
+ <target name="gen.p2mirror.script" description="use XSLT to generate a p2.mirror script from .target">
+ <echo level="verbose">Generate ${targetFile}.p2mirror.xml from ${targetFile} using useLatest=${useLatest}" />
+</echo>
+ <delete file="${targetFile}.p2mirror.xml" quiet="true" />
+ <xslt style="target2p2mirrorXml.xsl" in="${targetFile}" out="${targetFile}.p2mirror.xml" processor="trax">
+ <param name="useLatest" expression="${useLatest}" />
+ </xslt>
+ <echo>-----------
+
+ Next, be sure to run the resulting p2.mirror script.
+ You may need to run it a few times for it to complete
+ successfully (due to network timeouts and invalid mirrors).
+
+ For instructions on running the script, do this:
+
+ ant -f ${targetFile}.p2mirror.xml help
+ </echo>
+ </target>
+
+</project>
Added: branches/jbosstools-3.2.0.Beta1/build/target-platform/target2p2mirrorXml.xsl
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/target2p2mirrorXml.xsl (rev 0)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/target2p2mirrorXml.xsl 2010-10-02 00:32:13 UTC (rev 25420)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ version="2.0">
+<!--
+ This XSLT is used by target2p2mirror.xml to generate a p2.mirror ant script from a .target file
+-->
+ <xsl:output method="xml" indent="yes" encoding="UTF-8"
+ version="1.0" />
+
+ <!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
+ if useLatest = false, include versions and fetch specific versions requested. -->
+ <xsl:param name="useLatest" select="'true'" as="xs:string"/>
+
+ <xsl:param name="verbose" select="'${verbose}'" as="xs:string"/>
+ <xsl:param name="followStrict" select="'${followStrict}'" as="xs:string"/>
+ <xsl:param name="destination" select="'file:${repo.dir}'" as="xs:string"/>
+
+ <xsl:template match="target">
+ <project name="Download target platform" default="download.target.platform">
+ <target name="help">
+ <echo>
+ Generated with useLatest = <xsl:value-of select="$useLatest"/>
+
+ ---
+
+ Use followStrict="true" to prevent downloading all
+ requirements not included in the target platform
+ or
+ followStrict="false" to fetch everything
+
+ To run this script:
+
+ /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data \
+ /tmp/workspace -consolelog -application \
+ org.eclipse.ant.core.antRunner -f *.target.p2mirror.xml \
+ -Ddebug=true \
+ -DfollowStrict=true \
+ -Drepo.dir=/tmp/REPO/
+</echo>
+ </target>
+ <target name="init" unless="repo.dir">
+ <fail>Must set -Drepo.dir=/abs/path/to/download/artifacts/</fail>
+ </target>
+ <target name="download.target.platform" depends="init"
+ description="Download from target platform definition" if="repo.dir">
+ <property name="verbose" value="false" />
+ <property name="followStrict" value="false" />
+ <echo level="info">Download features/plugins into ${repo.dir}</echo>
+ <p2.mirror destination="{$destination}" verbose="{$verbose}">
+ <!-- should we add latestVersionOnly="true" to <slicingOptions> ? -->
+ <slicingOptions includeFeatures="true" followStrict="{$followStrict}"/>
+ <source>
+ <xsl:apply-templates select="//repository" />
+ </source>
+ <xsl:apply-templates select="//unit" />
+ <xsl:apply-templates select="//feature" />
+ <xsl:apply-templates select="//plugin" />
+ </p2.mirror>
+ </target>
+ </project>
+ </xsl:template>
+
+ <xsl:template match="//repository">
+ <xsl:variable name="locationUrl" select="./@location" />
+ <repository location="{$locationUrl}" />
+ </xsl:template>
+
+ <xsl:template match="//unit">
+ <xsl:choose>
+ <xsl:when test="$useLatest='true'">
+ <iu id="{@id}" version="" />
+ </xsl:when>
+ <xsl:otherwise>
+ <iu id="{@id}" version="{@version}" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="//plugin">
+ <iu id="{@id}" version="" />
+ </xsl:template>
+
+ <xsl:template match="//feature">
+ <iu id="{(a)id}.feature.group" version="" />
+ </xsl:template>
+
+ <!-- ignore anything else -->
+ <xsl:template match="environment|targetJRE|launcherArgs|includeBundles" />
+
+</xsl:stylesheet>
Added: branches/jbosstools-3.2.0.Beta1/build/target-platform/target2targetTemplate.xsl
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/target2targetTemplate.xsl (rev 0)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/target2targetTemplate.xsl 2010-10-02 00:32:13 UTC (rev 25420)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<!--
+ This XSLT is used by targetUpdateFromRepo.xml to update the versions on IUs in a .target file
+ CAUTION: do not auto-format this file or line breaks will appear where they should not be!
+-->
+
+<!-- Copy unit nodes and templatize their version attributes -->
+<xsl:template match="unit">
+<unit id="{@id}" version="${{{(a)id}.version}}">
+<xsl:apply-templates/>
+</unit>
+</xsl:template>
+
+<!-- Copy everything else unchanged -->
+<xsl:template match="@*|node()">
+<xsl:copy>
+<xsl:apply-templates select="@*|node()"/>
+</xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Added: branches/jbosstools-3.2.0.Beta1/build/target-platform/targetUpdateFromRepo.xml
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/target-platform/targetUpdateFromRepo.xml (rev 0)
+++ branches/jbosstools-3.2.0.Beta1/build/target-platform/targetUpdateFromRepo.xml 2010-10-02 00:32:13 UTC (rev 25420)
@@ -0,0 +1,51 @@
+<project default="custom.build" name="jbosstools target platform pom.xml + site.xml generator">
+ <property name="tmpDir" value="${java.io.tmpdir}/targetUpdateFromRepo" />
+ <property name="targetFile" value="e361-wtp322.target" />
+ <property name="repoDir" value="./REPO_SR1" />
+ <property name="outputDir" value="${basedir}" />
+ <!-- Instead of overwriting, can also create a new .target file in a different outputDir
+ <property name="outputDir" value="${tmpDir}" />
+ -->
+
+ <target name="custom.build" depends="check.content.xml, get.content.xml, copy.content.xml, contentXml2artifactVersions.xsl, target2targetTemplate.xsl, updateTargetFile, cleanup" />
+
+ <target name="check.content.xml" description="if content.jar, unpack to get content.xml">
+ <condition property="content.xml.exists" value="true">
+ <available file="${repoDir}/content.xml" />
+ </condition>
+ </target>
+ <target name="get.content.xml" unless="content.xml.exists">
+ <echo level="verbose">Unzip ${tmpDir}/content.xml</echo>
+ <unzip src="${repoDir}/content.jar" dest="${tmpDir}" />
+ </target>
+ <target name="copy.content.xml" if="content.xml.exists">
+ <echo level="verbose">Copy ${tmpDir}/content.xml</echo>
+ <copy file="${repoDir}/content.xml" todir="${tmpDir}" />
+ </target>
+
+ <target name="contentXml2artifactVersions.xsl">
+ <echo level="verbose">Generate ${tmpDir}/artifactVersions.properties</echo>
+ <xslt style="contentXml2artifactVersions.xsl" in="${tmpDir}/content.xml" out="${tmpDir}/artifactVersions.properties" processor="trax" />
+ </target>
+
+ <target name="target2targetTemplate.xsl" description="run target2targetTemplate.xsl to templatize .target file">
+ <echo level="verbose">Generate ${tmpDir}/${targetFile}.template</echo>
+ <xslt style="target2targetTemplate.xsl" in="${targetFile}" out="${tmpDir}/${targetFile}.template" processor="trax" />
+ </target>
+
+ <target name="updateTargetFile" description="load generated properties and resolve them in the template to create a new .target file">
+ <property file="${tmpDir}/artifactVersions.properties" />
+ <copy todir="${outputDir}" overwrite="true">
+ <fileset file="${tmpDir}/${targetFile}.template" />
+ <mapper type="merge" to="${targetFile}" />
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="cleanup" description="purge temporary dir">
+ <delete dir="${tmpDir}" includeemptydirs="true" quiet="true" />
+ </target>
+
+</project>
13 years, 7 months
- 1
- 0
JBoss Tools SVN: r25419 - branches/jbosstools-3.2.0.Beta1/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-01 20:31:21 -0400 (Fri, 01 Oct 2010)
New Revision: 25419
Modified:
branches/jbosstools-3.2.0.Beta1/build/parent/pom.xml
Log:
switch sites to pull from Helios SR1; reformatting
Modified: branches/jbosstools-3.2.0.Beta1/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/parent/pom.xml 2010-10-02 00:29:31 UTC (rev 25418)
+++ branches/jbosstools-3.2.0.Beta1/build/parent/pom.xml 2010-10-02 00:31:21 UTC (rev 25419)
@@ -11,7 +11,7 @@
</modules>
<properties>
- <!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion-->
+ <!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.9.0</tychoVersion>
<scmBranch>trunk</scmBranch>
<BUILD_ALIAS>Beta1</BUILD_ALIAS>
@@ -174,6 +174,27 @@
</build>
</profile>
+ <!-- Time saver: to build everything from scratch from a single local repo on Hudson cluster -->
+ <profile>
+ <id>helios-local-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>helios</id>
+ <url>file://home/hudson/static_build_env/jbds/target-platform/e36-wtp322.target/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
<!-- Time saver: to build everything from scratch (without target platform);
To enable it use -P helios-no-target in command line. Do not remove repos
that contains the same artefacts, it is done for purpose to make build more
@@ -195,21 +216,10 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
- <id>eclipse36</id>
- <url>http://download.eclipse.org/eclipse/updates/3.6.x/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
<repository>
- <id>jboss-helios</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/helios/</url>
+ <id>eclipse36</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.6.x/
+ </url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -218,9 +228,13 @@
<enabled>true</enabled>
</releases>
</repository>
+ <!-- <repository> <id>jboss-helios</id> <url>http://download.jboss.org/jbosstools/updates/requirements/helios/
+ </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
+ <releases> <enabled>true</enabled> </releases> </repository> -->
<repository>
- <id>webtools32</id>
- <url>http://download.eclipse.org/webtools/repository/helios</url>
+ <id>webtools322</id>
+ <url>http://download.eclipse.org/webtools/downloads/drops/R3.2.2/R-3.2.2-20100...
+ </url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -230,8 +244,8 @@
</releases>
</repository>
<repository>
- <id>jboss-webtools32</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/</url>
+ <id>webtools32</id>
+ <url>http://download.eclipse.org/webtools/repository/helios</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -240,6 +254,9 @@
<enabled>true</enabled>
</releases>
</repository>
+ <!-- <repository> <id>jboss-webtools32</id> <url>http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/
+ </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
+ <releases> <enabled>true</enabled> </releases> </repository> -->
<repository>
<id>birt26</id>
<url>http://download.eclipse.org/birt/update-site/2.6/
@@ -264,18 +281,9 @@
<enabled>true</enabled>
</releases>
</repository>
- <!--repository>
- <id>swtbot-helios</id>
- <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository-->
+ <!--repository> <id>swtbot-helios</id> <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
+ <releases> <enabled>true</enabled> </releases> </repository -->
<repository>
<id>jboss-swtbot-helios</id>
<url>http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/
@@ -310,18 +318,9 @@
<enabled>true</enabled>
</releases>
</repository>
- <!--repository>
- <id>jboss-orbit</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository-->
+ <!--repository> <id>jboss-orbit</id> <url>http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...
+ </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
+ <releases> <enabled>true</enabled> </releases> </repository -->
<repository>
<id>jboss-thirdparty</id>
<url>http://download.jboss.org/jbosstools/updates/requirements/thirdparty/
@@ -346,18 +345,9 @@
<enabled>true</enabled>
</releases>
</repository>
- <!--repository>
- <id>jboss-xulrunner-1.9.2</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository-->
+ <!--repository> <id>jboss-xulrunner-1.9.2</id> <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2/
+ </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
+ <releases> <enabled>true</enabled> </releases> </repository -->
<repository>
<id>google eclipse plugins</id>
<url>http://dl.google.com/eclipse/plugin/3.6</url>
13 years, 7 months
- 1
- 0
JBoss Tools SVN: r25418 - branches/jbosstools-3.2.0.Beta1/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-01 20:29:31 -0400 (Fri, 01 Oct 2010)
New Revision: 25418
Modified:
branches/jbosstools-3.2.0.Beta1/build/pom.xml
Log:
add missing modules
Modified: branches/jbosstools-3.2.0.Beta1/build/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/pom.xml 2010-10-02 00:29:17 UTC (rev 25417)
+++ branches/jbosstools-3.2.0.Beta1/build/pom.xml 2010-10-02 00:29:31 UTC (rev 25418)
@@ -413,6 +413,8 @@
<id>seam-bootstrap</id>
<modules>
<module>../tests</module>
+ <module>../jmx</module>
+ <module>../archives</module>
<module>../as</module>
<module>../hibernatetools</module>
<module>../common</module>
13 years, 7 months
- 1
- 0
JBoss Tools SVN: r25417 - branches/jbosstools-3.2.0.Beta1/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-01 20:29:17 -0400 (Fri, 01 Oct 2010)
New Revision: 25417
Modified:
branches/jbosstools-3.2.0.Beta1/build/build.xml
Log:
bump up to maven.version=3.0-beta-3
Modified: branches/jbosstools-3.2.0.Beta1/build/build.xml
===================================================================
--- branches/jbosstools-3.2.0.Beta1/build/build.xml 2010-10-02 00:15:40 UTC (rev 25416)
+++ branches/jbosstools-3.2.0.Beta1/build/build.xml 2010-10-02 00:29:17 UTC (rev 25417)
@@ -2,7 +2,7 @@
<!-- ****************************** Configuration ****************************** -->
<!-- default maven version -->
- <property name="maven.version" value="3.0-beta-1" />
+ <property name="maven.version" value="3.0-beta-3" />
<!-- set name of component(s) to build+test, IN ORDER; if no subcomponents, use "." -->
<property name="COMPONENTS"
13 years, 7 months
- 1
- 0
JBoss Tools SVN: r25416 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-01 20:15:40 -0400 (Fri, 01 Oct 2010)
New Revision: 25416
Modified:
trunk/build/target-platform/e361-wtp322.target
Log:
fix qualifier suffix for rse.feature.group 3.2.1.v201008191400
Modified: trunk/build/target-platform/e361-wtp322.target
===================================================================
--- trunk/build/target-platform/e361-wtp322.target 2010-10-02 00:07:12 UTC (rev 25415)
+++ trunk/build/target-platform/e361-wtp322.target 2010-10-02 00:15:40 UTC (rev 25416)
@@ -126,7 +126,7 @@
<unit id="org.eclipse.gef.feature.group" version="3.6.0.v20100519-2050-777B-81A2Bz-69793A8B83447"/>
<unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-678-8yE4F-8HAH4DFEF3447"/>
<unit id="org.eclipse.uml2.feature.group" version="3.1.0.v201006071150"/>
- <unit id="org.eclipse.rse.feature.group" version="3.2.1.v201008191400-7L78FA-8wqbPcNk4qa8R0eVlyGvo"/>
+ <unit id="org.eclipse.rse.feature.group" version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ"/>
<repository location="http://download.eclipse.org/releases/helios/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
13 years, 7 months
- 1
- 0
JBoss Tools SVN: r25415 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-10-01 20:07:12 -0400 (Fri, 01 Oct 2010)
New Revision: 25415
Modified:
trunk/build/parent/pom.xml
Log:
configurations for application packager were added to build/parent/pom.xml
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-10-01 22:46:37 UTC (rev 25414)
+++ trunk/build/parent/pom.xml 2010-10-02 00:07:12 UTC (rev 25415)
@@ -44,9 +44,43 @@
<version>${tychoVersion}</version>
<extensions>true</extensions>
</plugin>
-
+
<plugin>
<groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-packaging-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>carbon</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tychoVersion}</version>
<configuration>
@@ -195,6 +229,37 @@
</repositories>
</profile>
+ <profile>
+ <id>jbds-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <!--repositories>
+ <repository>
+ <id>jbosstools</id>
+ <url>jar:file:///home/eskimo/Projects/jbds-build/jbosstools-src/adt.builder/downloads/toTransform/jbdevstudio-Update-4.0.0.v201009250226N-Beta1.zip!/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>eclipse-rcp</id>
+ <url>jar:file:///home/eskimo/Projects/jbds-build/jbosstools-src/adt.builder/downloads/rcp.zip!/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories-->
+ </profile>
+
<!-- Time saver: to build everything from scratch (without target platform);
To enable it use -P helios-no-target in command line. Do not remove repos
that contains the same artefacts, it is done for purpose to make build more
13 years, 7 months
- 1
- 0
JBoss Tools SVN: r25414 - in trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage: internal/branding and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-01 18:46:37 -0400 (Fri, 01 Oct 2010)
New Revision: 25414
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/branding/IUsageBranding.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBranding.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBrandingMessages.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/UsageBrandingServiceTracker.java
Log:
[JBDS-1338] copyright headers added, IUsageBranding commented
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/branding/IUsageBranding.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/branding/IUsageBranding.java 2010-10-01 22:24:33 UTC (rev 25413)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/branding/IUsageBranding.java 2010-10-01 22:46:37 UTC (rev 25414)
@@ -1,5 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.usage.branding;
+/**
+ * Provides branding for usage reporting. Branding providers may register a
+ * service that provides a service that implements this interface. If there are
+ * several providers registered, the usage reporting picks the one with the
+ * highest <code>service.ranking<code> property.
+ *
+ * @author Andre Dietisheim
+ *
+ */
public interface IUsageBranding {
public String getPreferencesDescription();
@@ -18,5 +37,5 @@
public String getGoogleAnalyticsAccount();
- public String getGoogleAnalyticsReportingHost();
+ public String getGoogleAnalyticsReportingHost();
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBranding.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBranding.java 2010-10-01 22:24:33 UTC (rev 25413)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBranding.java 2010-10-01 22:46:37 UTC (rev 25414)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.usage.internal.branding;
import org.jboss.tools.usage.branding.IUsageBranding;
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBrandingMessages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBrandingMessages.java 2010-10-01 22:24:33 UTC (rev 25413)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBrandingMessages.java 2010-10-01 22:46:37 UTC (rev 25414)
@@ -20,11 +20,6 @@
public static String GlobalUsageSettings_RemoteProps_URL;
-// public static String UsageReportPreferencePage_Description_JBDS;
-// public static String UsageReportPreferencePage_AllowReporting_JBDS;
-//
-// public static String GlobalUsageSettings_RemoteProps_URL_JBDS;
-
public static String UsageReport_DialogTitle;
public static String UsageReport_DialogMessage;
public static String UsageReport_GoogleAnalytics_Account;
@@ -32,13 +27,6 @@
public static String UsageReport_HostName;
public static String UsageReport_ExplanationPage;
-// public static String UsageReport_DialogTitle_JBDS;
-// public static String UsageReport_DialogMessage_JBDS;
-// public static String UsageReport_GoogleAnalytics_Account_JBDS;
-// public static String UsageReport_Checkbox_Text_JBDS;
-// public static String UsageReport_HostName_JBDS;
-// public static String UsageReport_ExplanationPage_JBDS;
-
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, JBossToolsUsageBrandingMessages.class);
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/UsageBrandingServiceTracker.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/UsageBrandingServiceTracker.java 2010-10-01 22:24:33 UTC (rev 25413)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/UsageBrandingServiceTracker.java 2010-10-01 22:46:37 UTC (rev 25414)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.usage.internal.branding;
import org.jboss.tools.usage.branding.IUsageBranding;
13 years, 7 months
- 1
- 0
JBoss Tools SVN: r25413 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-01 18:24:33 -0400 (Fri, 01 Oct 2010)
New Revision: 25413
Added:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/UsageBrandingServiceTracker.java
Removed:
trunk/usage/plugins/org.jboss.tools.usage/META-INF/default-usage-branding.xml
Modified:
trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/messages.properties
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/GlobalUsageSettings.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java
trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch
trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
Log:
[JBDS-1338] simplified (removed service for default branding, now has direct access to default branding), corrected messages
Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-10-01 19:50:02 UTC (rev 25412)
+++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-10-01 22:24:33 UTC (rev 25413)
@@ -22,6 +22,5 @@
Bundle-Activator: org.jboss.tools.usage.internal.JBossToolsUsageActivator
Bundle-Vendor: %bundle-vendor
Bundle-ActivationPolicy: lazy
-Service-Component: META-INF/default-usage-branding.xml
Deleted: trunk/usage/plugins/org.jboss.tools.usage/META-INF/default-usage-branding.xml
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/META-INF/default-usage-branding.xml 2010-10-01 19:50:02 UTC (rev 25412)
+++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/default-usage-branding.xml 2010-10-01 22:24:33 UTC (rev 25413)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.jboss.tools.usage.branding">
- <implementation class="org.jboss.tools.usage.internal.branding.JBossToolsUsageBranding"/>
- <service>
- <provide interface="org.jboss.tools.usage.branding.IUsageBranding"/>
- </service>
- <property name="service.ranking" type="Integer" value="-1"/>/service>
-</scr:component>
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java 2010-10-01 19:50:02 UTC (rev 25412)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java 2010-10-01 22:24:33 UTC (rev 25413)
@@ -13,11 +13,10 @@
import org.eclipse.core.runtime.Plugin;
import org.jboss.tools.usage.branding.IUsageBranding;
import org.jboss.tools.usage.googleanalytics.IJBossToolsEclipseEnvironment;
+import org.jboss.tools.usage.internal.branding.UsageBrandingServiceTracker;
import org.jboss.tools.usage.internal.preferences.UsageReportPreferencesUtils;
import org.jboss.tools.usage.internal.reporting.JBossToolsEclipseEnvironment;
-import org.jboss.tools.usage.util.BundleUtils;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
/**
* @author Andre Dietisheim
@@ -30,6 +29,8 @@
private IJBossToolsEclipseEnvironment eclipseEnvironment;
+ private UsageBrandingServiceTracker branding;
+
public JBossToolsUsageActivator() {
plugin = this;
}
@@ -37,6 +38,8 @@
@Override
public void stop(BundleContext context) throws Exception {
plugin = null;
+ branding.close();
+ this.branding = null;
super.stop(context);
}
@@ -46,29 +49,29 @@
public void start(BundleContext context) throws Exception {
super.start(context);
+ initBranding(context);
}
+ private void initBranding(BundleContext context) {
+ branding = new UsageBrandingServiceTracker(getBundle().getBundleContext());
+ branding.open();
+ }
+
public IJBossToolsEclipseEnvironment getJBossToolsEclipseEnvironment() {
- try {
- if (eclipseEnvironment == null) {
- eclipseEnvironment = createEclipseEnvironment();
- }
- return eclipseEnvironment;
- } catch (Exception e) {
- return null;
+ if (eclipseEnvironment == null) {
+ eclipseEnvironment = createEclipseEnvironment();
}
+ return eclipseEnvironment;
}
- private IJBossToolsEclipseEnvironment createEclipseEnvironment() throws InvalidSyntaxException {
- IUsageBranding branding = BundleUtils.getHighestRankedService(IUsageBranding.class.getName(),
- JBossToolsUsageActivator
- .getDefault().getBundle());
- if (branding == null) {
- return null;
- }
-
+ private IJBossToolsEclipseEnvironment createEclipseEnvironment() {
+ IUsageBranding branding = getUsageBranding();
return new JBossToolsEclipseEnvironment(
branding.getGoogleAnalyticsAccount(), branding.getGoogleAnalyticsReportingHost(),
UsageReportPreferencesUtils.getPreferences());
}
+
+ public synchronized IUsageBranding getUsageBranding() {
+ return branding;
+ }
}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/UsageBrandingServiceTracker.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/UsageBrandingServiceTracker.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/UsageBrandingServiceTracker.java 2010-10-01 22:24:33 UTC (rev 25413)
@@ -0,0 +1,109 @@
+package org.jboss.tools.usage.internal.branding;
+
+import org.jboss.tools.usage.branding.IUsageBranding;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+
+public class UsageBrandingServiceTracker extends ServiceTracker implements IUsageBranding {
+
+ @Override
+ public Object addingService(ServiceReference reference) {
+ System.err.println(reference);
+ return super.addingService(reference);
+ }
+
+ @Override
+ public void removedService(ServiceReference reference, Object service) {
+ System.err.println(reference);
+ super.removedService(reference, service);
+ }
+
+ JBossToolsUsageBranding jbossBranding = new JBossToolsUsageBranding();
+
+ public UsageBrandingServiceTracker(BundleContext context) {
+ super(context, IUsageBranding.class.getName(), null);
+ }
+
+ public String getPreferencesDescription() {
+ IUsageBranding service = (IUsageBranding) getService();
+ if (service != null) {
+ return service.getPreferencesDescription();
+ } else {
+ return jbossBranding.getPreferencesDescription();
+ }
+ }
+
+ public String getPreferencesAllowReportingCheckboxLabel() {
+ IUsageBranding service = (IUsageBranding) getService();
+ if (service != null) {
+ return service.getPreferencesAllowReportingCheckboxLabel();
+ } else {
+ return jbossBranding.getPreferencesAllowReportingCheckboxLabel();
+ }
+ }
+
+ public String getStartupAllowReportingTitle() {
+ IUsageBranding service = (IUsageBranding) getService();
+ if (service != null) {
+ return service.getStartupAllowReportingTitle();
+ } else {
+ return jbossBranding.getStartupAllowReportingTitle();
+ }
+ }
+
+ public String getStartupAllowReportingCheckboxLabel() {
+ IUsageBranding service = (IUsageBranding) getService();
+ if (service != null) {
+ return service.getStartupAllowReportingCheckboxLabel();
+ } else {
+ return jbossBranding.getStartupAllowReportingCheckboxLabel();
+ }
+ }
+
+ public String getStartupAllowReportingMessage() {
+ IUsageBranding service = (IUsageBranding) getService();
+ if (service != null) {
+ return service.getStartupAllowReportingMessage();
+ } else {
+ return jbossBranding.getStartupAllowReportingMessage();
+ }
+ }
+
+ public String getStartupAllowReportingDetailLink() {
+ IUsageBranding service = (IUsageBranding) getService();
+ if (service != null) {
+ return service.getStartupAllowReportingDetailLink();
+ } else {
+ return jbossBranding.getStartupAllowReportingDetailLink();
+ }
+
+ }
+
+ public String getGlobalRemotePropertiesUrl() {
+ IUsageBranding service = (IUsageBranding) getService();
+ if (service != null) {
+ return service.getGlobalRemotePropertiesUrl();
+ } else {
+ return jbossBranding.getGlobalRemotePropertiesUrl();
+ }
+ }
+
+ public String getGoogleAnalyticsAccount() {
+ IUsageBranding service = (IUsageBranding) getService();
+ if (service != null) {
+ return service.getGoogleAnalyticsAccount();
+ } else {
+ return jbossBranding.getGoogleAnalyticsAccount();
+ }
+ }
+
+ public String getGoogleAnalyticsReportingHost() {
+ IUsageBranding service = (IUsageBranding) getService();
+ if (service != null) {
+ return service.getGoogleAnalyticsReportingHost();
+ } else {
+ return jbossBranding.getGoogleAnalyticsReportingHost();
+ }
+ }
+}
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/UsageBrandingServiceTracker.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/messages.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/messages.properties 2010-10-01 19:50:02 UTC (rev 25412)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/messages.properties 2010-10-01 22:24:33 UTC (rev 25413)
@@ -1,25 +1,11 @@
UsageReportPreferencePage_Description=Preference page with options for anonymous usage data reporting.\nUsage data is used for statistical matters only.
UsageReportPreferencePage_AllowReporting=&Please allow the JBoss Tools team to receive anonymous usage\n statistics for this Eclipse installation with JBoss Tools.
-UsageReportPreferencePage_Error_Saving=Could not save the preferences.
-GlobalUsageSettings_RemoteProps_URL=http://anonsvn.jboss.org/repos/jbosstools/workspace/usage/usage.properties
-
-# this is a hack to get into the code freeze deadline. this stuff will be removed with a proper implementatino
-UsageReportPreferencePage_Description_JBDS=Preference page with options for anonymous usage data reporting.\nUsage data is used for statistical matters only.
-UsageReportPreferencePage_AllowReporting_JBDS=&Please allow Red Hat Inc. to receive anonymous usage\n statistics for this JBoss Developer Studio installation.
-
-GlobalUsageSettings_RemoteProps_URL_JBDS=http://devstudio.jboss.com/usage/usage.properties
-
+UsageReport_DialogTitle=JBoss Tools Usage
UsageReport_DialogMessage=Please allow JBoss Tools team to receive anonymous usage statistics for this Eclipse instance with JBoss Tools (<a>info</a>).
-UsageReport_Checkbox_Text=Report usage of JBoss Tools to JBoss Tools team.
UsageReport_GoogleAnalytics_Account=UA-17645367-1
+UsageReport_Checkbox_Text=Report usage of JBoss Tools to JBoss Tools team.
UsageReport_HostName=jboss.org
UsageReport_ExplanationPage=http://jboss.org/tools/usage
-# this is a hack to get into the code freeze deadline. this stuff will be removed with a proper implementation
-UsageReport_DialogTitle_JBDS=JBoss Developer Studio Usage
-UsageReport_DialogMessage_JBDS=Please allow Red Hat Inc. to receive anonymous usage statistics for this JBoss Developer Studio installation (<a>info</a>).
-UsageReport_GoogleAnalytics_Account_JBDS=UA-18653195-2
-UsageReport_Checkbox_Text_JBDS=Report usage of JBoss Developer Studio to Red Hat Inc.
-UsageReport_HostName_JBDS=devstudio.jboss.com
-UsageReport_ExplanationPage_JBDS=http://devstudio.jboss.com/usage
+GlobalUsageSettings_RemoteProps_URL=http://anonsvn.jboss.org/repos/jbosstools/workspace/usage/usage.properties
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/GlobalUsageSettings.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/GlobalUsageSettings.java 2010-10-01 19:50:02 UTC (rev 25412)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/GlobalUsageSettings.java 2010-10-01 22:24:33 UTC (rev 25413)
@@ -12,15 +12,11 @@
import java.util.Map;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
import org.jboss.tools.usage.branding.IUsageBranding;
import org.jboss.tools.usage.http.HttpRemotePropertiesProvider;
import org.jboss.tools.usage.http.IPropertiesProvider;
import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
-import org.jboss.tools.usage.util.BundleUtils;
-import org.jboss.tools.usage.util.LoggingUtils;
-import org.jboss.tools.usage.util.StatusUtils;
/**
* A class that implements a global reporting enablement setting. The current
@@ -51,18 +47,12 @@
private IPropertiesProvider remoteMap;
public GlobalUsageSettings(Plugin plugin) {
- try {
- IUsageBranding brandingService = BundleUtils.getHighestRankedService(IUsageBranding.class.getName(),
- JBossToolsUsageActivator.getDefault().getBundle());
- remoteMap = createRemoteMap(
- brandingService.getGlobalRemotePropertiesUrl()
+ IUsageBranding branding = JBossToolsUsageActivator.getDefault().getUsageBranding();
+ remoteMap = createRemoteMap(
+ branding.getGlobalRemotePropertiesUrl()
, VALUE_DELIMITER
, plugin
, REMOTEPROPS_USAGE_REPORTING_ENABLED_KEY);
- } catch (Exception e) {
- IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, "could not ", e);
- LoggingUtils.log(status, JBossToolsUsageActivator.getDefault());
- }
}
/**
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java 2010-10-01 19:50:02 UTC (rev 25412)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java 2010-10-01 22:24:33 UTC (rev 25413)
@@ -17,7 +17,6 @@
import java.util.List;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
@@ -34,7 +33,6 @@
import org.jboss.tools.usage.googleanalytics.IJBossToolsEclipseEnvironment;
import org.jboss.tools.usage.googleanalytics.eclipse.IEclipseUserAgent;
import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
-import org.jboss.tools.usage.util.BundleUtils;
import org.jboss.tools.usage.util.StatusUtils;
import org.jboss.tools.usage.util.StringUtils;
import org.osgi.service.prefs.BackingStoreException;
@@ -46,9 +44,11 @@
private static final DateFormat DATE_FORMAT = SimpleDateFormat.getDateTimeInstance(DateFormat.MEDIUM,
DateFormat.SHORT);
+ private IUsageBranding branding;
public UsageReportPreferencePage() {
super(GRID);
+ this.branding = JBossToolsUsageActivator.getDefault().getUsageBranding();
}
@Override
@@ -171,36 +171,17 @@
}
public void createFieldEditors() {
- IUsageBranding branding;
- try {
- branding = BundleUtils.getHighestRankedService(IUsageBranding.class.getName(), JBossToolsUsageActivator
- .getDefault().getBundle());
- addField(new BooleanFieldEditor(
+ addField(new BooleanFieldEditor(
IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID
, branding.getPreferencesAllowReportingCheckboxLabel()
, getFieldEditorParent()));
- } catch (Exception e) {
- catchBrandingError(e);
- }
}
public void init(IWorkbench workbench) {
setPreferenceStore(UsageReportPreferences.createPreferenceStore());
- IUsageBranding branding;
- try {
- branding = BundleUtils.getHighestRankedService(IUsageBranding.class.getName(), JBossToolsUsageActivator
- .getDefault().getBundle());
- setDescription(branding.getPreferencesDescription());
- } catch (Exception e) {
- catchBrandingError(e);
- }
+ setDescription(branding.getPreferencesDescription());
}
- private void catchBrandingError(Exception e) {
- IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, "Could not find branding.", e);
- ErrorDialog.openError(getShell(), "Branding Error", "Could not display usage reporting preferences", status);
- }
-
@Override
public boolean performOk() {
try {
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java 2010-10-01 19:50:02 UTC (rev 25412)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java 2010-10-01 22:24:33 UTC (rev 25413)
@@ -10,9 +10,7 @@
******************************************************************************/
package org.jboss.tools.usage.internal.reporting;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.window.IShellProvider;
@@ -27,9 +25,6 @@
import org.jboss.tools.usage.branding.IUsageBranding;
import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
import org.jboss.tools.usage.util.BrowserUtil;
-import org.jboss.tools.usage.util.BundleUtils;
-import org.jboss.tools.usage.util.StatusUtils;
-import org.osgi.framework.InvalidSyntaxException;
/**
* @author Andre Dietisheim
@@ -38,10 +33,12 @@
private Button checkBox;
private boolean reportEnabled;
+ private IUsageBranding branding;
public UsageReportEnablementDialog(boolean reportEnabled, IShellProvider parentShell) {
super(parentShell);
this.reportEnabled = reportEnabled;
+ this.branding = JBossToolsUsageActivator.getDefault().getUsageBranding();
}
protected void buttonPressed(int buttonId) {
@@ -55,14 +52,7 @@
protected void configureShell(Shell shell) {
super.configureShell(shell);
- try {
- IUsageBranding branding = BundleUtils.getHighestRankedService(IUsageBranding.class.getName(),
- JBossToolsUsageActivator
- .getDefault().getBundle());
- shell.setText(branding.getStartupAllowReportingTitle());
- } catch (InvalidSyntaxException e) {
- catchBrandingError(e);
- }
+ shell.setText(branding.getStartupAllowReportingTitle());
}
protected void createButtonsForButtonBar(Composite parent) {
@@ -81,44 +71,32 @@
}
private void createUsageReportingWidgets(Composite parent, Composite composite) {
- try {
- // message
- Link link = new Link(composite, SWT.WRAP);
- link.setFont(parent.getFont());
+ // message
+ Link link = new Link(composite, SWT.WRAP);
+ link.setFont(parent.getFont());
- final IUsageBranding branding = BundleUtils.getHighestRankedService(IUsageBranding.class.getName(),
- JBossToolsUsageActivator.getDefault().getBundle());
- link.setText(branding.getStartupAllowReportingMessage());
- link.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- BrowserUtil.checkedCreateExternalBrowser(
+ link.setText(branding.getStartupAllowReportingMessage());
+ link.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ BrowserUtil.checkedCreateExternalBrowser(
branding.getStartupAllowReportingDetailLink(),
JBossToolsUsageActivator.PLUGIN_ID,
JBossToolsUsageActivator.getDefault().getLog());
- }
- });
- GridDataFactory.fillDefaults()
+ }
+ });
+ GridDataFactory.fillDefaults()
.align(SWT.FILL, SWT.CENTER)
.grab(true, false)
.hint(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH, SWT.DEFAULT)
.applyTo(link);
- // checkbox
- checkBox = new Button(composite, SWT.CHECK);
- checkBox.setText(branding.getStartupAllowReportingCheckboxLabel());
- GridDataFactory.fillDefaults().grab(true, false).align(SWT.LEFT, SWT.CENTER).applyTo(checkBox);
- } catch (Exception e) {
- catchBrandingError(e);
- }
+ // checkbox
+ checkBox = new Button(composite, SWT.CHECK);
+ checkBox.setText(branding.getStartupAllowReportingCheckboxLabel());
+ GridDataFactory.fillDefaults().grab(true, false).align(SWT.LEFT, SWT.CENTER).applyTo(checkBox);
}
- private void catchBrandingError(Exception e) {
- IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, "Could not find branding.", e);
- ErrorDialog.openError(getShell(), "Branding Error", "Could not ask to allow usage reporting", status);
- close();
- }
-
public boolean isReportEnabled() {
return reportEnabled;
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-10-01 19:50:02 UTC (rev 25412)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-10-01 22:24:33 UTC (rev 25413)
@@ -17,10 +17,6 @@
import org.jboss.tools.usage.util.collectionfilter.CollectionFilterUtils;
import org.jboss.tools.usage.util.collectionfilter.ICollectionFilter;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
/**
* @author Andre Dietisheim
@@ -74,42 +70,4 @@
return pattern.matcher(bundle.getSymbolicName()).matches();
}
}
-
-// @SuppressWarnings("unchecked")
-// public static <T> T getService(String serviceClass, Bundle bundle) {
-// BundleContext bundleContext = bundle.getBundleContext();
-// ServiceReference serviceReference = bundleContext.getServiceReference(serviceClass);
-// if (serviceReference == null) {
-// return null;
-// }
-// return (T) bundleContext.getService(serviceReference);
-// }
-
- @SuppressWarnings("unchecked")
- public static <T> T getHighestRankedService(String serviceClass, Bundle bundle) throws InvalidSyntaxException {
- BundleContext bundleContext = bundle.getBundleContext();
- ServiceReference[] serviceReferences = bundleContext.getServiceReferences(serviceClass, null);
- if (serviceReferences.length != 0) {
- ServiceReference reference = getHihgestRankedServiceReference(bundleContext, serviceReferences);
- if (reference != null) {
- return (T) bundleContext.getService(reference);
- }
- }
-
- return null;
- }
-
- private static ServiceReference getHihgestRankedServiceReference(BundleContext bundleContext,
- ServiceReference[] serviceReferences) {
- Integer highestRanking = Integer.MIN_VALUE;
- ServiceReference currentReference = null;
- for (ServiceReference reference : serviceReferences) {
- Integer ranking = (Integer) reference.getProperty(Constants.SERVICE_RANKING);
- if (ranking > highestRanking) {
- currentReference = reference;
- highestRanking = ranking;
- }
- }
- return currentReference;
- }
}
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch 2010-10-01 19:50:02 UTC (rev 25412)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch 2010-10-01 22:24:33 UTC (rev 25413)
@@ -11,20 +11,20 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Developer Studio Usage Reporter"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.jboss.tools.common.gef,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.tools.common.ui,org.jboss.tools.common.el.ui,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui,org.jboss.tools.tests,org.jboss.tools.common.model.test"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.mozilla.xulrunner.gtk.linux.x86,org.jboss.tools.common.gef,org.mozilla.xulrunner.carbon.macosx,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common.ui,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.common.el.ui,org.mozilla.xulrunner.win32.win32.x86,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.core.t!
est,org.mozilla.xpcom,org.jboss.tools.tests,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.http.servlet@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.engine@default:default,com.jboss.jbds.product@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.http.jetty@default:default,ch.qos.logback.classic@default:default,org.apache.ant@default:default,com.springsource.javax.servlet.jsp@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.resources@default:default,org.apache.lucene@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.jface.text@default:default,com.ibm.icu@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.repository@default:def!
ault,org.mortbay.jetty.util@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.transforms.hook@default:false,com.springsource.javax.el@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.commands@default:default,javax.activation@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,javax.servlet.jsp@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.help.base@default:default,org.eclipse.core.filesystem@default:default,org.apache.commons.el@default:default,org.apache.jasper@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.text@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org!
.eclipse.equinox.common@2:true,org.eclipse.ecf.identity@defaul!
t:defaul
t,org.eclipse.help@default:default,org.eclipse.ui.views@default:default,com.springsource.javax.servlet@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.net.linux.x86_64@default:false,com.springsource.javax.jms@default:default,org.eclipse.osgi.services@default:default,org.jboss.tools.xulrunner.initializer@default:false,javax.transaction@default:false,ch.qos.logback.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.swt@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.core.databinding@default:default,javax.mail@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.help.ui@default:default!
,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jface@default:default,org.slf4j.api@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.mozilla.xpcom@default:default,org.mozilla.xulrunner.gtk.linux.x86_64@default:default,org.mozilla.xulrunner.cocoa.macosx@default:default,org.mozilla.xulrunner.win32.win32.x86@default:default,org.mozilla.xulrunner.gtk.linux.x86@default:default,org.mozilla.xulrunner.carbon.macosx@default:default,org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.http.servlet@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi.services@default:default,org.eclipse.help@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.workbench@default:default,com.springsource.javax.jms@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.p2.repository@default:default,com.springsource.javax.servlet.jsp@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ui@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.metadata@default:default,javax.transaction@default:false,org.eclipse.equinox.concurrent@default:default,com.springsource.javax.servlet@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.engine@de!
fault:default,org.eclipse.jface@default:default,org.eclipse.swt@default:default,org.apache.commons.el@default:default,org.eclipse.ui.intro@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.osgi@-1:true,org.apache.jasper@default:default,org.eclipse.core.expressions@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.filesystem@default:default,org.mortbay.jetty.util@default:default,org.apache.lucene@default:default,ch.qos.logback.core@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.c!
ore.databinding@default:default,org.mortbay.jetty.server@defau!
lt:defau
lt,org.eclipse.ecf.identity@default:default,ch.qos.logback.classic@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.registry@default:default,com.jboss.jbds.product@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.ecf@default:default,org.apache.ant@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.common@2:true,org.eclipse.text@default:default,javax.activation@default:default,javax.mail@default:default,org.eclipse.ant.core@default:default,org.slf4j.api@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jface.text@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.help.base@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.commands@default:default,javax.servlet.jsp@default:default,org.jboss.tools!
.xulrunner.initializer@default:false,org.eclipse.ui.ide.application@default:default,com.ibm.icu@default:default,org.eclipse.help.ui@default:default,com.springsource.javax.el@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.net@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.runtime.compatibility.registry@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,com.jboss.jbds.usage.branding@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-10-01 19:50:02 UTC (rev 25412)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-10-01 22:24:33 UTC (rev 25413)
@@ -11,19 +11,19 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Tools Usage Reporter"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.mozilla.xulrunner.gtk.linux.x86,org.jboss.tools.common.gef,org.mozilla.xulrunner.carbon.macosx,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common.ui,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.common.el.ui,org.mozilla.xulrunner.win32.win32.x86,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.core.t!
est,org.mozilla.xpcom,org.jboss.tools.common.model.ui,org.jboss.tools.tests,org.jboss.tools.common.model.test"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,com.jboss.jbds.usage.branding,org.jboss.tools.common.verification.ui,org.jboss.tools.common.gef,org.mozilla.xulrunner.gtk.linux.x86,org.mozilla.xulrunner.carbon.macosx,org.jboss.tools.common.verification.test,org.jboss.tools.common.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common.ui,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.common.el.ui,org.mozilla.xulrunner.win32.win32.x86,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.el.core.test,org!
.jboss.tools.common.model.ui.test,org.mozilla.xpcom,org.jboss.tools.tests,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -debug"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -debug -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.help.base@default:default,org.mortbay.jetty.server@default:default,org.eclipse.swt@default:default,com.ibm.icu@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.common@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jface.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.resources@default:default,org.eclipse.help.ui@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.databinding@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.f!
ilesystem.linux.x86_64@default:false,org.eclipse.ecf@default:default,org.eclipse.text@default:default,javax.servlet@default:default,org.apache.lucene@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.apache.commons.el@default:default,javax.servlet.jsp@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ui.ide@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.jface@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.variables@default:default,org.eclipse.help@default:default,org.eclipse.core.runtime@default:true,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.provider.filetransfer@default:defau!
lt,org.eclipse.equinox.http.servlet@default:default,org.eclips!
e.update
.configurator@default:default,org.eclipse.osgi.services@default:default,org.apache.jasper@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.sdk@default:default,org.eclipse.ui.views@default:default,org.eclipse.osgi,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ant.core@default:default,org.apache.ant@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.registry@default:default,org.junit4@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.hamcrest.core@default:default,org.eclipse.ui@default:default,org.eclipse.core.runtime.comp!
atibility.auth@default:default,org.eclipse.core.net@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ecf.filetransfer@default:default,org.hamcrest.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.forms@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,javax.servlet.jsp@default:default,org.eclipse.jface.databinding@default:default,org.apache.commons.el@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.ds@default:true,org.eclipse.equinox.p2.engine@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.concurrent@default:default,org!
.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ant.core@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.sdk@default:default,org.eclipse.jface@default:default,javax.servlet@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.filesystem@default:default,org.junit4@default:default,com.ibm.icu@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.util@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui!
.workbench@default:default,org.eclipse.help.ui@default:default!
,org.ecl
ipse.ecf@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.help@default:default,org.eclipse.swt@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.databinding@default:default,org.eclipse.help.base@default:default,org.eclipse.ui@default:default,org.eclipse.ui.cheatsheets@default:default,org.apache.ant@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ui.ide@default:default,org.apache.jasper@default:default,org.apache.lucene@default:default,org.eclipse.text@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.contenttype@default:default,org.ec!
lipse.core.net@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.ide.application@default:default,org.mortbay.jetty.server@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.mortbay.jetty.util@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
13 years, 7 months
- 1
- 0
JBoss Tools SVN: r25412 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-01 15:50:02 -0400 (Fri, 01 Oct 2010)
New Revision: 25412
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-3.0.xml
Log:
./publishExample.sh https://anonsvn.jboss.org/repos/jbosstools/workspace/examples/project-exa...
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-3.0.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-3.0.xml 2010-10-01 19:01:54 UTC (rev 25411)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-3.0.xml 2010-10-01 19:50:02 UTC (rev 25412)
@@ -138,96 +138,10 @@
</fixes>
</project>
+
+
<project>
<category>Seam</category>
-
- <name>booking2</name>
- <included-projects>
- booking,booking-ear,booking-ejb,booking-parent,booking-test
- </included-projects>
- <shortDescription>Seam Booking Example - EAR mavenized</shortDescription>
- <description>This example demonstrates the use of Seam in a Java EE 5 environment.
-Transaction and persistence context management is handled by the EJB container.
-It includes the booking, booking-ear, booking-ejb,booking-test and booking-parent projects.
-Requires JBoss EAP 4.3/JBoss AS 4.2.x, Seam 2.0, m2eclipse and testng plugins.
-</description>
- <size>203639</size>
-
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
- </url>
- <fixes>
- <fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
- <property name="eclipse-projects">booking,booking-ejb,booking-ear</property>
- <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property>
- </fix>
-
- <fix type="seam">
- <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property>
- <property name="eclipse-projects">booking</property>
- <property name="description">This project example requires Seam version 2.0</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.testng.eclipse</property>
- <property name="versions">5.8.0, 5.9.0</property>
- <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property>
- </fix>
-
- <fix type="plugin">
- <property name="id">org.maven.ide.eclipse.wtp</property>
- <property name="versions">0.9.9, 0.10.0</property>
- <property name="description">This project example requires m2eclipse. You can install it using the following update sites: http://m2eclipse.sonatype.org/sites/m2e and http://m2eclipse.sonatype.org/sites/m2e-extras</property>
- </fix>
-
- </fixes>
- </project>
-
- <project>
- <category>Seam</category>
- <name>booking3</name>
- <included-projects>
- booking,booking-ear,booking-ejb,booking-parent,booking-test
- </included-projects>
- <shortDescription>Seam Booking Example - EAR mavenized - Seam 2.1.1.GA</shortDescription>
- <description>This example demonstrates the use of Seam in a Java EE 5 environment.
-Transaction and persistence context management is handled by the EJB container.
-It includes the booking, booking-ear, booking-ejb, booking-test and booking-parent projects.
-Requires JBoss EAP 4.3/JBoss AS 4.2.x, Seam 2.1, m2eclipse and testng plugins.
-</description>
- <size>196608</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
- </url>
-
- <fixes>
- <fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
- <property name="eclipse-projects">booking,booking-ejb,booking-ear</property>
- <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property>
- </fix>
-
- <fix type="seam">
- <property name="allowed-versions">2.1.0, 2.1.1, 2.1.2</property>
- <property name="eclipse-projects">booking</property>
- <property name="description">This project example requires Seam version 2.1</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.testng.eclipse</property>
- <property name="versions">5.8.0, 5.9.0</property>
- <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.maven.ide.eclipse.wtp</property>
- <property name="versions">0.9.9, 0.10.0</property>
- <property name="description">This project example requires m2eclipse. You can install it using the following update sites: http://m2eclipse.sonatype.org/sites/m2e and http://m2eclipse.sonatype.org/sites/m2e-extras</property>
- </fix>
-
- </fixes>
- </project>
-
- <project>
- <category>Seam</category>
<name>jboss-seam-jpa</name>
<shortDescription>Seam Booking Example - WAR Standalone</shortDescription>
<description>This example demonstrates the use of Seam in a Java EE 5 environment.
13 years, 7 months
- 1
- 0