JBoss Tools SVN: r25372 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud-docs.
by jbosstools-commits@lists.jboss.org
Author: jjohnstn
Date: 2010-09-30 19:30:18 -0400 (Thu, 30 Sep 2010)
New Revision: 25372
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud-docs/pom.xml
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud-docs/ChangeLog
Log:
2010-09-30 Jeff Johnston <jjohnstn(a)redhat.com>
* pom.xml: New file.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud-docs/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud-docs/ChangeLog 2010-09-30 22:35:02 UTC (rev 25371)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud-docs/ChangeLog 2010-09-30 23:30:18 UTC (rev 25372)
@@ -1,3 +1,7 @@
2010-09-30 Jeff Johnston <jjohnstn(a)redhat.com>
+ * pom.xml: New file.
+
+2010-09-30 Jeff Johnston <jjohnstn(a)redhat.com>
+
* Initial check-in.
\ No newline at end of file
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud-docs/pom.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud-docs/pom.xml (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud-docs/pom.xml 2010-09-30 23:30:18 UTC (rev 25372)
@@ -0,0 +1,13 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <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>
+ <groupId>org.jboss.tools.deltacloud.plugins</groupId>
+ <artifactId>org.jboss.tools.deltacloud-docs</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
14 years, 2 months
JBoss Tools SVN: r25371 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-09-30 18:35:02 -0400 (Thu, 30 Sep 2010)
New Revision: 25371
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml
Log:
updated with new values as specified by Andre
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2010-09-30 21:59:11 UTC (rev 25370)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2010-09-30 22:35:02 UTC (rev 25371)
@@ -911,10 +911,19 @@
</para>
<variablelist>
<varlistentry>
+ <term>Version</term>
+ <listitem>
+ <para>
+ The <guilabel>Content</guilabel> field has been modified to report the installed JBoss Developer Studio version. Sample returned values include: jbdevstudio-linux-gtk-x86_64-4.0.0.v201009301221R-H20-Beta1.jar and jbdevstudio-linux-gtk-3.0.2.v201009161622R-H138-GA.jar.
+ </para>
+ </listitem>
+ </varlistentry>
+ <variablelist>
+ <varlistentry>
<term>Installed components</term>
<listitem>
<para>
- The <guilabel>Keyword</guilabel> field has been modified to report the installed JBoss Tools components. Sample returned values include: JBoss AS, Drools, Teiid and ModeShape.
+ The <guilabel>Keyword</guilabel> field has been modified to report the installed JBoss Developer Studio components. Sample returned values include: JBoss AS, Drools, Teiid and ModeShape.
</para>
</listitem>
</varlistentry>
@@ -954,11 +963,19 @@
<term>Operating System</term>
<listitem>
<para>
- The <guilabel>Operating System</guilabel> field reports the Operating System and its version that the product is running on (with no version reporting currently available for Linux distributions). Sample returned values include: Linux, Macintosh 10.4, Macintosh 10.6, Windows XP and Windows 7.
+ The <guilabel>Operating System</guilabel> field reports the Operating System and its version that the product is running on (with Linux distribution version reporting conducted through the <guilabel>User Defined Value</guilabel> field). Sample returned values include: Linux, Macintosh 10.4, Macintosh 10.6, Windows XP and Windows 7.
</para>
</listitem>
</varlistentry>
<varlistentry>
+ <term>Linux distribution version</term>
+ <listitem>
+ <para>
+ The <guilabel>User Defined Value</guilabel> field reports the distribution and version of Linux, if one is being used as the Operating System. Sample returned values include: Red Hat Enterprise Linux 5.4 and Fedora 13.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>Screen colors</term>
<listitem>
<para>
14 years, 2 months
JBoss Tools SVN: r25370 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-30 17:59:11 -0400 (Thu, 30 Sep 2010)
New Revision: 25370
Modified:
trunk/build/target-platform/README.txt
Log:
update readme w/ publishing instructions
Modified: trunk/build/target-platform/README.txt
===================================================================
--- trunk/build/target-platform/README.txt 2010-09-30 21:51:49 UTC (rev 25369)
+++ trunk/build/target-platform/README.txt 2010-09-30 21:59:11 UTC (rev 25370)
@@ -16,8 +16,28 @@
3. Resulting repo can be added to Eclipse and from there, *uncategorized* features can be installed.
-== Updating an existing .target file from newer versions of IUs in a repo ==
+== 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
@@ -26,7 +46,7 @@
repo's content.xml file.
-== Installing the contents of a repo into Eclipse (via script) ==
+== HOWTO: Install the contents of a repo into Eclipse (via script) ==
1. See ../installation/README.txt
14 years, 2 months
JBoss Tools SVN: r25369 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-30 17:51:49 -0400 (Thu, 30 Sep 2010)
New Revision: 25369
Modified:
trunk/build/target-platform/
Log:
svn:ignore
Property changes on: trunk/build/target-platform
___________________________________________________________________
Name: svn:ignore
+ REPO*
*target.zip
log*.txt
14 years, 2 months
JBoss Tools SVN: r25368 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-30 17:49:51 -0400 (Thu, 30 Sep 2010)
New Revision: 25368
Removed:
trunk/build/target-platform/install.xml
Log:
remove install.xml script (incomplete, not needed) -- see ../installation/README.txt for complete/tested install script
Deleted: trunk/build/target-platform/install.xml
===================================================================
--- trunk/build/target-platform/install.xml 2010-09-30 21:48:26 UTC (rev 25367)
+++ trunk/build/target-platform/install.xml 2010-09-30 21:49:51 UTC (rev 25368)
@@ -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>
14 years, 2 months
JBoss Tools SVN: r25367 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-30 17:48:26 -0400 (Thu, 30 Sep 2010)
New Revision: 25367
Removed:
trunk/build/target-platform/site/
Log:
remove tycho-generated site/ folder (doesn't work)
14 years, 2 months
JBoss Tools SVN: r25366 - in trunk/build/target-platform: OLD and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-30 17:45:55 -0400 (Thu, 30 Sep 2010)
New Revision: 25366
Added:
trunk/build/target-platform/OLD/target2pomXml.xsl
trunk/build/target-platform/OLD/target2site.xml
trunk/build/target-platform/OLD/target2siteXml.xsl
Removed:
trunk/build/target-platform/target2pomXml.xsl
trunk/build/target-platform/target2site.xml
trunk/build/target-platform/target2siteXml.xsl
Log:
deprecated scripts for generating tycho update site from .target file
Copied: trunk/build/target-platform/OLD/target2pomXml.xsl (from rev 25174, trunk/build/target-platform/target2pomXml.xsl)
===================================================================
--- trunk/build/target-platform/OLD/target2pomXml.xsl (rev 0)
+++ trunk/build/target-platform/OLD/target2pomXml.xsl 2010-09-30 21:45:55 UTC (rev 25366)
@@ -0,0 +1,99 @@
+<?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="useLatest" select="'true'" />
+
+ <xsl:variable name="platformFilter"
+ select="concat(/target/environment/os/text(), ',', /target/environment/ws/text(), ',', /target/environment/arch/text())" />
+
+ <xsl:template match="target">
+ <project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <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>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.target.platform.site</artifactId>
+ <name>JBoss Tools Target Platform Definition Site</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-update-site</packaging>
+
+ <profiles>
+ <profile>
+ <id>targetPlatformRepositories</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <xsl:apply-templates select="//repository" />
+ </repositories>
+ </profile>
+ </profiles>
+ </project>
+ </xsl:template>
+
+ <xsl:template match="//repository">
+ <repository>
+ <id>
+ <xsl:variable name="myString" select="@id" />
+ <xsl:variable name="myNewString">
+ <xsl:call-template name="replaceCharsInString">
+ <xsl:with-param name="stringIn"
+ select="substring-after(@location, '//')" />
+ <xsl:with-param name="charsIn" select="'/'" />
+ <xsl:with-param name="charsOut" select="'_'" />
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:value-of select="$myNewString" />
+ </id>
+ <url>
+ <xsl:value-of select="@location" />
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </xsl:template>
+
+ <!-- ignore anything else -->
+ <xsl:template
+ match="environment|targetJRE|launcherArgs|includeBundles|location|locations|unit|feature" />
+
+ <!-- pretend this is in a template -->
+
+ <!-- here is the template that does the replacement -->
+ <xsl:template name="replaceCharsInString">
+ <xsl:param name="stringIn" />
+ <xsl:param name="charsIn" />
+ <xsl:param name="charsOut" />
+ <xsl:choose>
+ <xsl:when test="contains($stringIn,$charsIn)">
+ <xsl:value-of
+ select="concat(substring-before($stringIn,$charsIn),$charsOut)" />
+ <xsl:call-template name="replaceCharsInString">
+ <xsl:with-param name="stringIn"
+ select="substring-after($stringIn,$charsIn)" />
+ <xsl:with-param name="charsIn" select="$charsIn" />
+ <xsl:with-param name="charsOut" select="$charsOut" />
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$stringIn" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Property changes on: trunk/build/target-platform/OLD/target2pomXml.xsl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/build/target-platform/OLD/target2site.xml (from rev 25174, trunk/build/target-platform/target2site.xml)
===================================================================
--- trunk/build/target-platform/OLD/target2site.xml (rev 0)
+++ trunk/build/target-platform/OLD/target2site.xml 2010-09-30 21:45:55 UTC (rev 25366)
@@ -0,0 +1,15 @@
+<project default="custom.build" name="jbosstools target platform pom.xml + site.xml generator">
+ <property name="targetFile" value="e361-wtp322.target" />
+
+ <target name="custom.build" depends="pom.xml, site.xml" />
+
+ <target name="pom.xml" description="use XSLT to generate a pom.xml from .target">
+ <echo level="verbose">Generate site/pom.xml from ${targetFile}</echo>
+ <xslt style="target2pomXml.xsl" in="${targetFile}" out="site/pom.xml" processor="trax" />
+ </target>
+
+ <target name="site.xml" description="use XSLT to generate a site.xml from .target">
+ <echo level="verbose">Generate site/site.xml from ${targetFile}</echo>
+ <xslt style="target2siteXml.xsl" in="${targetFile}" out="site/site.xml" processor="trax" />
+ </target>
+</project>
Property changes on: trunk/build/target-platform/OLD/target2site.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/build/target-platform/OLD/target2siteXml.xsl (from rev 25174, trunk/build/target-platform/target2siteXml.xsl)
===================================================================
--- trunk/build/target-platform/OLD/target2siteXml.xsl (rev 0)
+++ trunk/build/target-platform/OLD/target2siteXml.xsl 2010-09-30 21:45:55 UTC (rev 25366)
@@ -0,0 +1,78 @@
+<?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="," />
+
+ <!-- should we include {@version} for specific ver, or 0.0.0 for latest
+ avail? -->
+ <xsl:param name="useLatest" select="'true'" />
+
+ <xsl:variable name="platformFilter"
+ select="concat(/target/environment/os/text(), ',', /target/environment/ws/text(), ',', /target/environment/arch/text())" />
+
+ <xsl:template match="target">
+ <site>
+ <description>JBoss Tools Target Platform Update Site / p2 Repo</description>
+ <category-def name="TargetPlatform" label="TargetPlatform">
+ <description>JBoss Tools Target Platform</description>
+ </category-def>
+
+ <xsl:apply-templates select="//unit" />
+ <xsl:apply-templates select="//feature" />
+ </site>
+ </xsl:template>
+
+ <xsl:template match="//unit">
+ <xsl:choose>
+ <xsl:when test="substring-before(@id,'.feature.group')!=''">
+ <xsl:choose>
+ <xsl:when test="$useLatest='true'">
+ <feature
+ url="features/{substring-before(@id,'.feature.group')}_0.0.0.jar"
+ id="{substring-before(@id,'.feature.group')}" version="0.0.0">
+ <category name="TargetPlatform" />
+ </feature>
+ </xsl:when>
+ <xsl:otherwise>
+ <feature
+ url="features/{substring-before(@id,'.feature.group')}_{(a)version}.jar"
+ id="{substring-before(@id,'.feature.group')}" version="{@version}">
+ <category name="TargetPlatform" />
+ </feature>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="$useLatest='true'">
+ <bundle url="plugins/{(a)id}_0.0.0.jar" id="{@id}"
+ version="0.0.0">
+ <category name="TargetPlatform" />
+ </bundle>
+ </xsl:when>
+ <xsl:otherwise>
+ <bundle url="plugins/{@id}_{(a)version}.jar" id="{@id}"
+ version="{@version}">
+ <category name="TargetPlatform" />
+ </bundle>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="//feature">
+ <feature url="features/{(a)id}_0.0.0.jar" id="{@id}" version="0.0.0">
+ <category name="TargetPlatform" />
+ </feature>
+ </xsl:template>
+
+ <!-- ignore anything else -->
+ <xsl:template
+ match="environment|targetJRE|launcherArgs|includeBundles|location|locations" />
+
+</xsl:stylesheet>
\ No newline at end of file
Property changes on: trunk/build/target-platform/OLD/target2siteXml.xsl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/build/target-platform/target2pomXml.xsl
===================================================================
--- trunk/build/target-platform/target2pomXml.xsl 2010-09-30 21:44:01 UTC (rev 25365)
+++ trunk/build/target-platform/target2pomXml.xsl 2010-09-30 21:45:55 UTC (rev 25366)
@@ -1,99 +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="useLatest" select="'true'" />
-
- <xsl:variable name="platformFilter"
- select="concat(/target/environment/os/text(), ',', /target/environment/ws/text(), ',', /target/environment/arch/text())" />
-
- <xsl:template match="target">
- <project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <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>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.target.platform.site</artifactId>
- <name>JBoss Tools Target Platform Definition Site</name>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>eclipse-update-site</packaging>
-
- <profiles>
- <profile>
- <id>targetPlatformRepositories</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <xsl:apply-templates select="//repository" />
- </repositories>
- </profile>
- </profiles>
- </project>
- </xsl:template>
-
- <xsl:template match="//repository">
- <repository>
- <id>
- <xsl:variable name="myString" select="@id" />
- <xsl:variable name="myNewString">
- <xsl:call-template name="replaceCharsInString">
- <xsl:with-param name="stringIn"
- select="substring-after(@location, '//')" />
- <xsl:with-param name="charsIn" select="'/'" />
- <xsl:with-param name="charsOut" select="'_'" />
- </xsl:call-template>
- </xsl:variable>
- <xsl:value-of select="$myNewString" />
- </id>
- <url>
- <xsl:value-of select="@location" />
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </xsl:template>
-
- <!-- ignore anything else -->
- <xsl:template
- match="environment|targetJRE|launcherArgs|includeBundles|location|locations|unit|feature" />
-
- <!-- pretend this is in a template -->
-
- <!-- here is the template that does the replacement -->
- <xsl:template name="replaceCharsInString">
- <xsl:param name="stringIn" />
- <xsl:param name="charsIn" />
- <xsl:param name="charsOut" />
- <xsl:choose>
- <xsl:when test="contains($stringIn,$charsIn)">
- <xsl:value-of
- select="concat(substring-before($stringIn,$charsIn),$charsOut)" />
- <xsl:call-template name="replaceCharsInString">
- <xsl:with-param name="stringIn"
- select="substring-after($stringIn,$charsIn)" />
- <xsl:with-param name="charsIn" select="$charsIn" />
- <xsl:with-param name="charsOut" select="$charsOut" />
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$stringIn" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Deleted: trunk/build/target-platform/target2site.xml
===================================================================
--- trunk/build/target-platform/target2site.xml 2010-09-30 21:44:01 UTC (rev 25365)
+++ trunk/build/target-platform/target2site.xml 2010-09-30 21:45:55 UTC (rev 25366)
@@ -1,15 +0,0 @@
-<project default="custom.build" name="jbosstools target platform pom.xml + site.xml generator">
- <property name="targetFile" value="e36-wtp32.target" />
-
- <target name="custom.build" depends="pom.xml, site.xml" />
-
- <target name="pom.xml" description="use XSLT to generate a pom.xml from .target">
- <echo level="verbose">Generate site/pom.xml from ${targetFile}</echo>
- <xslt style="target2pomXml.xsl" in="${targetFile}" out="site/pom.xml" processor="trax" />
- </target>
-
- <target name="site.xml" description="use XSLT to generate a site.xml from .target">
- <echo level="verbose">Generate site/site.xml from ${targetFile}</echo>
- <xslt style="target2siteXml.xsl" in="${targetFile}" out="site/site.xml" processor="trax" />
- </target>
-</project>
Deleted: trunk/build/target-platform/target2siteXml.xsl
===================================================================
--- trunk/build/target-platform/target2siteXml.xsl 2010-09-30 21:44:01 UTC (rev 25365)
+++ trunk/build/target-platform/target2siteXml.xsl 2010-09-30 21:45:55 UTC (rev 25366)
@@ -1,78 +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="," />
-
- <!-- should we include {@version} for specific ver, or 0.0.0 for latest
- avail? -->
- <xsl:param name="useLatest" select="'true'" />
-
- <xsl:variable name="platformFilter"
- select="concat(/target/environment/os/text(), ',', /target/environment/ws/text(), ',', /target/environment/arch/text())" />
-
- <xsl:template match="target">
- <site>
- <description>JBoss Tools Target Platform Update Site / p2 Repo</description>
- <category-def name="TargetPlatform" label="TargetPlatform">
- <description>JBoss Tools Target Platform</description>
- </category-def>
-
- <xsl:apply-templates select="//unit" />
- <xsl:apply-templates select="//feature" />
- </site>
- </xsl:template>
-
- <xsl:template match="//unit">
- <xsl:choose>
- <xsl:when test="substring-before(@id,'.feature.group')!=''">
- <xsl:choose>
- <xsl:when test="$useLatest='true'">
- <feature
- url="features/{substring-before(@id,'.feature.group')}_0.0.0.jar"
- id="{substring-before(@id,'.feature.group')}" version="0.0.0">
- <category name="TargetPlatform" />
- </feature>
- </xsl:when>
- <xsl:otherwise>
- <feature
- url="features/{substring-before(@id,'.feature.group')}_{(a)version}.jar"
- id="{substring-before(@id,'.feature.group')}" version="{@version}">
- <category name="TargetPlatform" />
- </feature>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="$useLatest='true'">
- <bundle url="plugins/{(a)id}_0.0.0.jar" id="{@id}"
- version="0.0.0">
- <category name="TargetPlatform" />
- </bundle>
- </xsl:when>
- <xsl:otherwise>
- <bundle url="plugins/{@id}_{(a)version}.jar" id="{@id}"
- version="{@version}">
- <category name="TargetPlatform" />
- </bundle>
- </xsl:otherwise>
- </xsl:choose>
-
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="//feature">
- <feature url="features/{(a)id}_0.0.0.jar" id="{@id}" version="0.0.0">
- <category name="TargetPlatform" />
- </feature>
- </xsl:template>
-
- <!-- ignore anything else -->
- <xsl:template
- match="environment|targetJRE|launcherArgs|includeBundles|location|locations" />
-
-</xsl:stylesheet>
\ No newline at end of file
14 years, 2 months
JBoss Tools SVN: r25365 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-30 17:44:01 -0400 (Thu, 30 Sep 2010)
New Revision: 25365
Modified:
trunk/build/target-platform/pom.xml
Log:
remove generation of p2mirror.xml script during creation of target platform pom (not needed)
Modified: trunk/build/target-platform/pom.xml
===================================================================
--- trunk/build/target-platform/pom.xml 2010-09-30 21:39:43 UTC (rev 25364)
+++ trunk/build/target-platform/pom.xml 2010-09-30 21:44:01 UTC (rev 25365)
@@ -40,53 +40,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>generateSiteXml</id>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <!-- generate a p2mirror.xml for subsequent generation of a target as update site -->
- <property name="targetFile" value="${targetFile}" />
- <ant antfile="target2p2mirror.xml"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-commons-net</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-apache-regexp</artifactId>
- <version>1.7.1</version>
- </dependency>
- <!-- trax (xslt processor) depends on xalan:xalan:2.7.0, xerces:xercesImpl:2.9.0,
- xml-apis:xml-apis:1.3.04 -->
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.7.1</version>
- </dependency>
- <!-- <dependency> <groupId>ant-contrib</groupId> <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version> </dependency> -->
-
- </dependencies>
- </plugin>
</plugins>
</build>
14 years, 2 months
JBoss Tools SVN: r25364 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-30 17:39:43 -0400 (Thu, 30 Sep 2010)
New Revision: 25364
Added:
trunk/build/target-platform/README.txt
Log:
Document how to use xml/xsl scripts for 1. target to local p2 repo; 2. updating .target from repo versions; 3. installing from repo via script (p2.director)
Added: trunk/build/target-platform/README.txt
===================================================================
--- trunk/build/target-platform/README.txt (rev 0)
+++ trunk/build/target-platform/README.txt 2010-09-30 21:39:43 UTC (rev 25364)
@@ -0,0 +1,32 @@
+== 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.
+
+
+== Updating 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.
+
+
+== Installing the contents of a repo into Eclipse (via script) ==
+
+1. See ../installation/README.txt
+
Property changes on: trunk/build/target-platform/README.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 2 months
JBoss Tools SVN: r25363 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-30 17:38:30 -0400 (Thu, 30 Sep 2010)
New Revision: 25363
Modified:
trunk/build/target-platform/target2p2mirror.xml
trunk/build/target-platform/target2p2mirrorXml.xsl
Log:
add descriptions and comments; useLatest is now a parameter
Modified: trunk/build/target-platform/target2p2mirror.xml
===================================================================
--- trunk/build/target-platform/target2p2mirror.xml 2010-09-30 21:37:29 UTC (rev 25362)
+++ trunk/build/target-platform/target2p2mirror.xml 2010-09-30 21:38:30 UTC (rev 25363)
@@ -1,13 +1,29 @@
<project default="custom.build" name="jbosstools target platform p2.mirror generator">
<property name="targetFile" value="e361-wtp322.target" />
- <target name="custom.build" depends="gen.p2mirror.script, run.p2mirror.script" />
+ <!-- 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}</echo>
- <xslt style="target2p2mirrorXml.xsl" in="${targetFile}" out="${targetFile}.p2mirror.xml" processor="trax" />
+ <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>
- <target name="run.p2mirror.script" />
-
</project>
Modified: trunk/build/target-platform/target2p2mirrorXml.xsl
===================================================================
--- trunk/build/target-platform/target2p2mirrorXml.xsl 2010-09-30 21:37:29 UTC (rev 25362)
+++ trunk/build/target-platform/target2p2mirrorXml.xsl 2010-09-30 21:38:30 UTC (rev 25363)
@@ -1,26 +1,28 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
+<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" />
- <xsl:decimal-format decimal-separator="."
- grouping-separator="," />
- <!-- should we include {@version} for specific ver, or 0.0.0 for latest
- avail? -->
- <xsl:param name="useLatest" select="'true'" />
+ <!-- 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}'" />
- <xsl:param name="followStrict" select="'${followStrict}'" />
- <xsl:param name="destination" select="'file:${repo.dir}'" />
+ <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: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>
+ Generated with useLatest = <xsl:value-of select="$useLatest"/>
+
+ ---
+
Use followStrict="true" to prevent downloading all
requirements not included in the target platform
or
14 years, 2 months