[jbosstools-commits] JBoss Tools SVN: r42411 - trunk/central/site.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Thu Jul 5 11:30:05 EDT 2012


Author: mickael_istria
Date: 2012-07-05 11:30:04 -0400 (Thu, 05 Jul 2012)
New Revision: 42411

Added:
   trunk/central/site/category.xml
Removed:
   trunk/central/site/site.xml
Modified:
   trunk/central/site/pom.xml
Log:
JBIDE-11065: Replace invocation of aggregation script by generate-repository-facade on Central


Copied: trunk/central/site/category.xml (from rev 42330, trunk/central/site/site.xml)
===================================================================
--- trunk/central/site/category.xml	                        (rev 0)
+++ trunk/central/site/category.xml	2012-07-05 15:30:04 UTC (rev 42411)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <description>
+      To install these features, point Eclipse at this site.
+   </description>
+   <feature url="features/org.jboss.tools.community.central.feature_0.0.0.jar" id="org.jboss.tools.community.central.feature" version="0.0.0">
+      <category name="JBoss Central Nightly Build Update Site"/>
+   </feature>
+   <feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0">
+   </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.test.feature_0.0.0.jar" id="org.jboss.tools.central.test.feature" version="0.0.0">
+      <category name="JBoss Central Nightly Build Update Site"/>
+   </feature>
+
+   <category-def name="JBoss Central Nightly Build Update Site" label="JBoss Central Nightly Build Update Site">
+      <description>
+         JBoss Central Nightly Build Update Site: contains all features in this build.
+      </description>
+   </category-def>
+</site>

Modified: trunk/central/site/pom.xml
===================================================================
--- trunk/central/site/pom.xml	2012-07-05 14:18:26 UTC (rev 42410)
+++ trunk/central/site/pom.xml	2012-07-05 15:30:04 UTC (rev 42411)
@@ -10,76 +10,35 @@
 	<groupId>org.jboss.tools.central</groupId>
 	<artifactId>central.site</artifactId>
 	<name>central.site</name>
-	<packaging>eclipse-update-site</packaging>
+	<packaging>eclipse-repository</packaging>
+
+	<properties>
+		<update.site.description>Snapshots</update.site.description>
+		<update.site.version>${JBT_VERSION} ${BUILD_ALIAS}</update.site.version>
+	</properties>
+
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>${maven.antrun.plugin.version}</version>
+				<groupId>org.jboss.tools.tycho-plugins</groupId>
+				<artifactId>repository-utils</artifactId>
+				<version>0.0.1-SNAPSHOT</version>
 				<executions>
 					<execution>
-						<id>install</id>
-						<phase>install</phase>
-						<configuration>
-							<quiet>true</quiet>
-							<tasks>
-								<!-- called AFTER generating update site + zip to add in extra content -->
-								<!-- <ant antfile="build.xml" target="generate.directory.xml.only" dir="../../build/aggregate/"> -->
-								<ant antfile="build.xml" target="basic.build" dir="../../build/aggregate/">
-									<property name="output.dir" value="${basedir}" />
-									<property name="inputRepo"
-										value="${jbosstools-nightly-staging-composite}" />
-									<property name="update.site.name" value="JBoss Tools - Central"/>
-									<property name="JBT_VERSION" value="${JBT_VERSION}" />
-									<property name="BUILD_ALIAS" value="${BUILD_ALIAS}" />
-								</ant>
-								<delete file="index.html"/>
-								<delete file="jbosstools-directory.xml"/>
-							</tasks>
-						</configuration>
+						<id>generate-facade</id>
+						<phase>package</phase>
 						<goals>
-							<goal>run</goal>
+							<goal>generate-repository-facade</goal>
 						</goals>
+						<configuration>
+							<symbols>
+								<update.site.name>JBoss Tools - Central</update.site.name>
+								<update.site.description>${update.site.description}</update.site.description>
+								<update.site.version>${update.site.version}</update.site.version>
+							</symbols>
+						</configuration>
 					</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</artifactId>
-						<version>1.7.1</version>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.ant</groupId>
-						<artifactId>ant-nodeps</artifactId>
-						<version>1.7.1</version>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.ant</groupId>
-						<artifactId>ant-trax</artifactId>
-						<version>1.7.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>
-					<dependency>
-						<groupId>ant-contrib</groupId>
-						<artifactId>ant-contrib</artifactId>
-						<version>1.0b3</version>
-					</dependency>
-				</dependencies>
 			</plugin>
 		</plugins>
 	</build>

Deleted: trunk/central/site/site.xml
===================================================================
--- trunk/central/site/site.xml	2012-07-05 14:18:26 UTC (rev 42410)
+++ trunk/central/site/site.xml	2012-07-05 15:30:04 UTC (rev 42411)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <description>
-      To install these features, point Eclipse at this site.
-   </description>
-   <feature url="features/org.jboss.tools.community.central.feature_0.0.0.jar" id="org.jboss.tools.community.central.feature" version="0.0.0">
-      <category name="JBoss Central Nightly Build Update Site"/>
-   </feature>
-   <feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0">
-   </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.test.feature_0.0.0.jar" id="org.jboss.tools.central.test.feature" version="0.0.0">
-      <category name="JBoss Central Nightly Build Update Site"/>
-   </feature>
-
-   <category-def name="JBoss Central Nightly Build Update Site" label="JBoss Central Nightly Build Update Site">
-      <description>
-         JBoss Central Nightly Build Update Site: contains all features in this build.
-      </description>
-   </category-def>
-</site>



More information about the jbosstools-commits mailing list