JBoss Tools SVN: r44541 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-16 16:52:27 -0400 (Tue, 16 Oct 2012)
New Revision: 44541
Modified:
trunk/build/aggregate/build.xml
Log:
fix grammar in fail msg
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-10-16 20:52:20 UTC (rev 44540)
+++ trunk/build/aggregate/build.xml 2012-10-16 20:52:27 UTC (rev 44541)
@@ -511,7 +511,7 @@
<then>
<fail>
--
-Could not find ${update.site.source.dir} and one of ${project.build.directory}/site_assembly.zip
+Could not find ${update.site.source.dir} and ${project.build.directory}/site_assembly.zip
Cannot adjust an update site w/o first building it!
--
Using maven: mvn3 clean install -U -B -fae -q -e
12 years, 11 months
JBoss Tools SVN: r44540 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-16 16:52:20 -0400 (Tue, 16 Oct 2012)
New Revision: 44540
Modified:
trunk/build/aggregate/site/site.xml
Log:
JBIDE-12389 to hide central.discovery plugin and feature, exclude source feature too
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2012-10-16 20:52:13 UTC (rev 44539)
+++ trunk/build/aggregate/site/site.xml 2012-10-16 20:52:20 UTC (rev 44540)
@@ -257,8 +257,7 @@
<feature url="features/org.jboss.tools.community.central.feature.source_0.0.0.jar" id="org.jboss.tools.community.central.feature.source" version="0.0.0">
<category name="AllSources" />
</feature>
- <feature url="features/org.jboss.tools.central.discovery.feature.source_0.0.0.jar" id="org.jboss.tools.central.discovery.feature.source" version="0.0.0">
- </feature>
+ <!-- JBIDE-12389 to hide central.discovery plugin and feature, exclude source feature too <feature url="features/org.jboss.tools.central.discovery.feature.source_0.0.0.jar" id="org.jboss.tools.central.discovery.feature.source" version="0.0.0"/> -->
<feature url="features/org.jboss.tools.richfaces.feature.source_0.0.0.jar" id="org.jboss.tools.richfaces.feature.source" version="0.0.0">
<category name="AllSources" />
</feature>
12 years, 11 months
JBoss Tools SVN: r44539 - trunk/central/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-16 16:52:13 -0400 (Tue, 16 Oct 2012)
New Revision: 44539
Modified:
trunk/central/site/category.xml
Log:
JBIDE-12389 to hide central.discovery plugin and feature, exclude source feature too
Modified: trunk/central/site/category.xml
===================================================================
--- trunk/central/site/category.xml 2012-10-16 20:12:36 UTC (rev 44538)
+++ trunk/central/site/category.xml 2012-10-16 20:52:13 UTC (rev 44539)
@@ -15,8 +15,7 @@
</feature>
<feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0">
</feature>
- <feature url="features/org.jboss.tools.central.discovery.feature.source_0.0.0.jar" id="org.jboss.tools.central.discovery.feature.source" version="0.0.0">
- </feature>
+ <!-- JBIDE-12389 to hide central.discovery plugin and feature, exclude source feature too <feature url="features/org.jboss.tools.central.discovery.feature.source_0.0.0.jar" id="org.jboss.tools.central.discovery.feature.source" version="0.0.0"/> -->
<feature id="org.jboss.tools.central.themes.feature" version="0.0.0"/>
<feature id="org.jboss.tools.central.themes.feature.source" version="0.0.0"/>
12 years, 11 months
JBoss Tools SVN: r44537 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-16 16:12:29 -0400 (Tue, 16 Oct 2012)
New Revision: 44537
Modified:
trunk/build/aggregate/build.xml
Log:
use {update.site.source.dir} instead of {project.build.directory}/site so we're targeting the correct folder; simplify if check
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-10-16 20:12:22 UTC (rev 44536)
+++ trunk/build/aggregate/build.xml 2012-10-16 20:12:29 UTC (rev 44537)
@@ -488,7 +488,7 @@
<if>
<available file="${project.build.directory}/category.xml" type="file"/>
<then>
- <move file="${project.build.directory}/category.xml" tofile="${project.build.directory}/site/category.xml" />
+ <move file="${project.build.directory}/category.xml" tofile="${update.site.source.dir}/category.xml" />
</then>
</if>
<!-- support eclipse-repository (new) and eclipse-update-site (old): rename central.site-1.1.0-SNAPSHOT.zip to site_assembly.zip to be compatible with publish.sh script -->
@@ -503,21 +503,15 @@
<if>
<not>
- <or>
- <and> <!-- Old school eclipse-update-site -->
- <available file="${project.build.directory}/site" type="dir" />
- <available file="${project.build.directory}/site_assembly.zip" type="file" />
- </and>
- <and> <!-- eclipse-repository -->
- <available file="${project.build.directory}/repository" type="dir"/>
- <available file="${project.build.directory}/site_assembly.zip" type="file" />
- </and>
- </or>
+ <and>
+ <available file="${update.site.source.dir}" type="dir" />
+ <available file="${project.build.directory}/site_assembly.zip" type="file" />
+ </and>
</not>
<then>
<fail>
--
-Could not find ${project.build.directory}/site and one of ${project.build.directory}/site_assembly.zip or ${project.build.directory}/*.zip
+Could not find ${update.site.source.dir} and one of ${project.build.directory}/site_assembly.zip
Cannot adjust an update site w/o first building it!
--
Using maven: mvn3 clean install -U -B -fae -q -e
12 years, 11 months
JBoss Tools SVN: r44536 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-16 16:12:22 -0400 (Tue, 16 Oct 2012)
New Revision: 44536
Modified:
trunk/build/aggregate/remove-uncategorized.xsl
Log:
removing the default category should be done whether we're starting from site.xml or category.xml
Modified: trunk/build/aggregate/remove-uncategorized.xsl
===================================================================
--- trunk/build/aggregate/remove-uncategorized.xsl 2012-10-16 20:12:16 UTC (rev 44535)
+++ trunk/build/aggregate/remove-uncategorized.xsl 2012-10-16 20:12:22 UTC (rev 44536)
@@ -15,6 +15,6 @@
</xsl:copy>
</xsl:template>
-<xsl:template match="unit[contains(@id,'site.xml.Default')]" />
+<xsl:template match="unit[contains(@id,'.Default')]" />
</xsl:stylesheet>
\ No newline at end of file
12 years, 11 months
JBoss Tools SVN: r44535 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-16 16:12:16 -0400 (Tue, 16 Oct 2012)
New Revision: 44535
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.properties
Log:
JBIDE-12389 label central.discovery plugin with 'do not install this plugin'
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.properties
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.properties 2012-10-16 20:12:09 UTC (rev 44534)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.properties 2012-10-16 20:12:16 UTC (rev 44535)
@@ -1,3 +1,3 @@
BundleVendor = JBoss by Red Hat
-BundleName = JBoss Central Discovery
+BundleName = JBoss Central Discovery - do not install this plugin
12 years, 11 months
JBoss Tools SVN: r44534 - trunk/central/plugins/org.jboss.tools.central.discovery/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-16 16:12:09 -0400 (Tue, 16 Oct 2012)
New Revision: 44534
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/META-INF/MANIFEST.MF
Log:
switch name and vendor labels
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/META-INF/MANIFEST.MF
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/META-INF/MANIFEST.MF 2012-10-16 20:12:02 UTC (rev 44533)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/META-INF/MANIFEST.MF 2012-10-16 20:12:09 UTC (rev 44534)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: %BundleVendor
+Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.central.discovery;singleton:=true
Bundle-Version: 1.1.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
@@ -8,4 +8,4 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
-Bundle-Vendor: %BundleName
+Bundle-Vendor: %BundleVendor
12 years, 11 months
JBoss Tools SVN: r44533 - trunk/central/features/org.jboss.tools.central.discovery.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-16 16:12:02 -0400 (Tue, 16 Oct 2012)
New Revision: 44533
Modified:
trunk/central/features/org.jboss.tools.central.discovery.feature/feature.properties
Log:
JBIDE-12389 label central.discovery.feature with 'do not install this feature'
Modified: trunk/central/features/org.jboss.tools.central.discovery.feature/feature.properties
===================================================================
--- trunk/central/features/org.jboss.tools.central.discovery.feature/feature.properties 2012-10-16 20:11:54 UTC (rev 44532)
+++ trunk/central/features/org.jboss.tools.central.discovery.feature/feature.properties 2012-10-16 20:12:02 UTC (rev 44533)
@@ -15,7 +15,7 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=JBoss Central Discovery
+featureName=JBoss Central Discovery - do not install this feature
# "providerName" property - name of the company that provides the feature
providerName=JBoss by Red Hat
12 years, 11 months
JBoss Tools SVN: r44532 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-16 16:11:54 -0400 (Tue, 16 Oct 2012)
New Revision: 44532
Added:
trunk/build/aggregate/remove-uninstallable.xsl
Modified:
trunk/build/aggregate/build.xml
Log:
fix build.xml so it can be called by central site builder w/o extra processing in the pom.xml; JBIDE-12389: exclude features/plugins with 'do not install' in their name or description
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-10-16 20:05:22 UTC (rev 44531)
+++ trunk/build/aggregate/build.xml 2012-10-16 20:11:54 UTC (rev 44532)
@@ -26,8 +26,13 @@
<tempfile property="tmpdir" destDir="${java.io.tmpdir}" prefix="aggregate-site-build"/>
<mkdir dir="${tmpdir}" />
- <property name="update.site.source.dir" value="${output.dir}/target/site" />
+ <property name="project.build.directory" value="${output.dir}/target"/>
+ <!-- look for target/repository (new) or target/site (old) -->
+ <condition property="update.site.source.dir" value="${project.build.directory}/site" else="${project.build.directory}/repository">
+ <available file="${project.build.directory}/site" type="dir" />
+ </condition>
+
<!-- load properties from file -->
<condition property="associate.properties" value="${output.dir}/associate.properties">
<available file="${output.dir}/associate.properties" type="file" />
@@ -39,7 +44,7 @@
<echo level="verbose">Loaded associate sites from ${associate.properties}</echo>
<property name="web.content.files" value="index.html, web/*.css, README*, *directory.xml, site.xml, site.properties" />
- <property name="target.zip" value="${output.dir}/target/repository.zip"/>
+ <property name="target.zip" value="${project.build.directory}/site_assembly.zip"/>
<target name="init">
<echo>
@@ -61,7 +66,7 @@
<antcall target="get.saxon" />
</target>
- <target name="basic.build" description="JBT aggregate update site extra processing steps" depends="init,check.target,add.repo.properties,unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,add.web.content,pack.content.jar,pack.zip,cleanup" />
+ <target name="basic.build" description="JBT aggregate update site extra processing steps" depends="init,check.target,add.repo.properties,unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,remove.uninstallable,add.web.content,pack.content.jar,pack.zip,cleanup" />
<target name="custom.build" description="JBT aggregate update site extra processing steps" depends="basic.build,collect.zips,collect.metadata,create.summary.file,cleanup" />
<target name="get.ant-contrib" unless="ant-contrib.jar.exists">
@@ -448,6 +453,11 @@
<xslt style="remove-uncategorized.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" />
</target>
+ <target name="remove.uninstallable">
+ <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" />
+ <xslt style="remove-uninstallable.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" />
+ </target>
+
<target name="unpack.content.jar">
<if>
<available file="${update.site.source.dir}/content.jar" type="file" />
@@ -473,30 +483,41 @@
</target>
<target name="check.target">
+
+ <!-- support eclipse-repository (new) and eclipse-update-site (old): put category.xml in correct folder -->
<if>
- <or>
- <and> <!-- Old school eclipse-update-site -->
- <available file="${output.dir}/target/site" type="dir" />
- <available file="${output.dir}/target/site_assembly.zip" type="file" />
- </and>
- <and> <!-- eclipse-repository -->
- <available file="${output.dir}/target/repository" type="dir"/>
- <available file="${output.dir}/target/repository.zip" type="file" />
- </and>
- </or>
+ <available file="${project.build.directory}/category.xml" type="file"/>
<then>
- <if>
- <available file="${output.dir}/target/site_assembly.zip" type="file" />
- <then>
- <var name="target.zip" unset="true"/>
- <var name="target.zip" value="${output.dir}/target/site_assembly.zip"/>
- </then>
- </if>
+ <move file="${project.build.directory}/category.xml" tofile="${project.build.directory}/site/category.xml" />
</then>
- <else>
+ </if>
+ <!-- support eclipse-repository (new) and eclipse-update-site (old): rename central.site-1.1.0-SNAPSHOT.zip to site_assembly.zip to be compatible with publish.sh script -->
+ <if>
+ <not><available file="${project.build.directory}/site_assembly.zip" type="file"/></not>
+ <then>
+ <move tofile="${project.build.directory}/site_assembly.zip">
+ <fileset dir="${project.build.directory}" includes="*.zip" excludes="site.zip, site_assembly.zip"/>
+ </move>
+ </then>
+ </if>
+
+ <if>
+ <not>
+ <or>
+ <and> <!-- Old school eclipse-update-site -->
+ <available file="${project.build.directory}/site" type="dir" />
+ <available file="${project.build.directory}/site_assembly.zip" type="file" />
+ </and>
+ <and> <!-- eclipse-repository -->
+ <available file="${project.build.directory}/repository" type="dir"/>
+ <available file="${project.build.directory}/site_assembly.zip" type="file" />
+ </and>
+ </or>
+ </not>
+ <then>
<fail>
--
-Could not find ${output.dir}/target/site and one of ${output.dir}/target/site_assembly.zip or ${output.dir}/target/repository.zip
+Could not find ${project.build.directory}/site and one of ${project.build.directory}/site_assembly.zip or ${project.build.directory}/*.zip
Cannot adjust an update site w/o first building it!
--
Using maven: mvn3 clean install -U -B -fae -q -e
@@ -504,7 +525,7 @@
Using ant: ant basic.build -f ../build.xml -Doutput.dir=`pwd`
Using ant: ant custom.build -f ../build.xml -Doutput.dir=`pwd` -DinputRepo=http://download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk/
</fail>
- </else>
+ </then>
</if>
</target>
Added: trunk/build/aggregate/remove-uninstallable.xsl
===================================================================
--- trunk/build/aggregate/remove-uninstallable.xsl (rev 0)
+++ trunk/build/aggregate/remove-uninstallable.xsl 2012-10-16 20:11:54 UTC (rev 44532)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+
+<xsl:template match="/">
+ <xsl:apply-templates select="*"/>
+</xsl:template>
+
+
+<xsl:template match="*">
+ <xsl:copy >
+ <xsl:for-each select="@*">
+ <xsl:copy />
+ </xsl:for-each>
+ <xsl:apply-templates />
+ </xsl:copy>
+</xsl:template>
+
+<!-- remove uninstallable features/plugins based on their names/descriptions
+<properties>
+<property name="df_LT.bundleName" value="... do not install ..."/>
+<property name="df_LT.featureName" value="... do not install ..."/>
+<property name="df_LT.description" value="... do not install ..."/>
+</properties>
+-->
+<xsl:template match="unit[*/property[contains(@value,'do not install')]]" />
+
+</xsl:stylesheet>
\ No newline at end of file
12 years, 11 months