Permalink
Browse files

JBIDE-8838

* Change parent to add a tychoExtrasVersion
* Tentative on birt
-> Remove previous source features
-> Generate feature with tycho-source-feature-plugin
-> reference generated features in category.xml and removed previous manual source features (s/source.feature/feature.source)

git-svn-id: http://svn.jboss.org/repos/jbosstools/trunk@39526 a97e2381-89e5-4abb-bab3-167db6db766c
  • Loading branch information...
1 parent 60728a6 commit 6928c569016557ac8ba8359879c45226ab38bb5b @mickaelistria mickaelistria committed Mar 15, 2012
@@ -9,4 +9,37 @@
<groupId>org.jboss.tools.birt.features</groupId>
<artifactId>org.jboss.tools.birt.feature</artifactId>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.birt.source.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties,\
- license.html
@@ -1,45 +0,0 @@
-###############################################################################
-# Copyright (c) 2008-2012 Red Hat, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are 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:
-# JBoss by Red Hat - Initial implementation.
-##############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JBoss BIRT Integration source
-featureProvider=JBoss by Red Hat
-
-# "updateSiteName" property - label for the update site
-updateSiteName=JBossTools Update Site
-
-# "description" property - description of the feature
-description=JBoss BIRT Integration
-gets incrementally updated allowing for fluent deployment for any type of Eclipse project.
-
-copyright=JBoss, Home of Professional Open Source\nCopyright (c) Red Hat, Inc., and individual contributors as indicated\nby the @authors tag, 2006-2011. See the copyright.txt in the distribution\nfor a full listing of individual contributors.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# START NON-TRANSLATABLE
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=Red Hat, Inc. licenses these features and plugins to you under \
-certain open source licenses (or aggregations of such licenses), which \
-in a particular case may include the Eclipse Public License, the GNU \
-Lesser General Public License, and/or certain other open source \
-licenses. For precise licensing details, consult the corresponding \
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
-Raleigh NC 27606 USA.
-# END NON-TRANSLATABLE
-########### end of license property ##########################################
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.birt.source.feature" label="%featureName" version="1.3.0.qualifier" provider-name="%featureProvider">
-
- <description>
- %description
- </description>
-
- <copyright>
- JBoss, Home of Professional Open Source
-Copyright (c) 2008-2012 Red Hat, Inc., and individual contributors as indicated
-by the @authors tag. See the copyright.txt in the distribution
-for a full listing of individual contributors.
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin id="org.jboss.tools.birt.oda.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.birt.oda.ui.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.birt.core.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
-</feature>
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<body>
-<p>Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
-</p>
-</body>
-</html>
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.birt</groupId>
- <artifactId>features</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.tools.birt.features</groupId>
- <artifactId>org.jboss.tools.birt.source.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
@@ -9,4 +9,37 @@
<groupId>org.jboss.tools.birt.features</groupId>
<artifactId>org.jboss.tools.birt.test.feature</artifactId>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.birt.test.source.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties,\
- license.html
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2008-2012 Red Hat, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are 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:
-# JBoss by Red Hat - Initial implementation.
-##############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JBoss BIRT Integration tests source
-featureProvider=JBoss by Red Hat
-
-# "updateSiteName" property - label for the update site
-updateSiteName=JBossTools Update Site
-
-# "description" property - description of the feature
-description=JBoss BIRT Integration tests
-
-copyright=JBoss, Home of Professional Open Source\n\
-Copyright (c) Red Hat, Inc., and individual contributors as indicated\n\
-by the @authors tag, 2008-2012. See the copyright.txt in the distribution\n\
-for a full listing of individual contributors.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# START NON-TRANSLATABLE
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=Red Hat, Inc. licenses these features and plugins to you under \
-certain open source licenses (or aggregations of such licenses), which \
-in a particular case may include the Eclipse Public License, the GNU \
-Lesser General Public License, and/or certain other open source \
-licenses. For precise licensing details, consult the corresponding \
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
-Raleigh NC 27606 USA.
-# END NON-TRANSLATABLE
-########### end of license property ##########################################
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.birt.test.source.feature" label="%featureName" version="1.3.0.qualifier" provider-name="%featureProvider">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin id="org.jboss.tools.birt.core.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
-</feature>
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<body>
-<p>Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
-</p>
-</body>
-</html>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.birt</groupId>
- <artifactId>features</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.tools.birt.features</groupId>
- <artifactId>org.jboss.tools.birt.test.source.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
View
@@ -13,9 +13,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.birt.feature</module>
- <module>org.jboss.tools.birt.source.feature</module>
<module>org.jboss.tools.birt.test.feature</module>
- <module>org.jboss.tools.birt.test.source.feature</module>
</modules>
</project>
View
@@ -8,13 +8,13 @@
<feature url="features/org.jboss.tools.birt.feature_0.0.0.jar" id="org.jboss.tools.birt.feature" version="0.0.0">
<category name="JBoss Tools birt Nightly Build Update Site"/>
</feature>
- <feature url="features/org.jboss.tools.birt.source.feature_0.0.0.jar" id="org.jboss.tools.birt.source.feature" version="0.0.0">
+ <feature url="features/org.jboss.tools.birt.feature.source_0.0.0.jar" id="org.jboss.tools.birt.feature.source" version="0.0.0">
<category name="JBoss Tools birt Nightly Build Update Site"/>
</feature>
<feature url="features/org.jboss.tools.birt.test.feature_0.0.0.jar" id="org.jboss.tools.birt.test.feature" version="0.0.0">
<category name="JBoss Tools birt Nightly Build Update Site"/>
</feature>
- <feature url="features/org.jboss.tools.birt.test.source.feature_0.0.0.jar" id="org.jboss.tools.birt.test.source.feature" version="0.0.0">
+ <feature url="features/org.jboss.tools.birt.test.feature.source_0.0.0.jar" id="org.jboss.tools.birt.test.feature.source" version="0.0.0">
<category name="JBoss Tools birt Nightly Build Update Site"/>
</feature>

0 comments on commit 6928c56

Please sign in to comment.