Author: bimargulies Date: Mon Aug 29 18:44:11 2011 New Revision: 1162941 URL: http://svn.apache.org/viewvc?rev=1162941&view=rev Log: Build all the way down to a p2 site.
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml (with props) Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml?rev=1162941&view=auto ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml (added) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml Mon Aug 29 18:44:11 2011 @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<site> + <category-def name="org.apache.maven.doxia.ide.eclipse" label="Apache Maven Doxia Editors"/> + <feature url="features/org.apache.maven.doxia.ide.eclipse.feature_1.0.0.qualifier.jar" + id="org.apache.maven.doxia.ide.eclipse.feature" version="1.0.0.qualifier"> + <category name="org.apache.maven.doxia.ide.eclipse"/> + </feature> +</site> Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml?rev=1162941&r1=1162940&r2=1162941&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml Mon Aug 29 18:44:11 2011 @@ -21,8 +21,8 @@ under the License. <feature id="org.apache.maven.doxia.ide.eclipse.feature" - label="Doxia Feature Feature" - version="1.0.0" + label="Doxia Editors Feature" + version="1.0.0.qualifier" provider-name="Apache Maven"> <description url="http://maven.apache.org/doxia/"> @@ -114,4 +114,11 @@ under the License. version="0.0.0" unpack="false"/> + <plugin + id="org.apache.maven.doxia.ide.dependencies" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/pom.xml?rev=1162941&r1=1162940&r2=1162941&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/pom.xml Mon Aug 29 18:44:11 2011 @@ -23,14 +23,14 @@ under the License. <modelVersion>4.0.0</modelVersion> <parent> + <version>1.0.0-SNAPSHOT</version> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>features</artifactId> - <version>1.0-tycho-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.maven.doxia.ide.features</groupId> <artifactId>default-feature</artifactId> + <packaging>eclipse-feature</packaging> <name>Doxia Tools :: Eclipse IDE - Common Feature</name> <description>Eclipse IDE - Common Feature</description> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/pom.xml?rev=1162941&r1=1162940&r2=1162941&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/pom.xml Mon Aug 29 18:44:11 2011 @@ -24,9 +24,8 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>eclipse</artifactId> - <version>1.0-tycho-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <artifactId>eclipse-plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.maven.doxia.ide</groupId> @@ -35,41 +34,48 @@ under the License. <name>Doxia Tools :: Eclipse IDE - Parent Features POM</name> <description>Eclipse IDE - Parent Features POM</description> + <!-- dependencies in a parent pom are generally evil, but this + is a stopgap until I sort out a dispute with tycho --> + <dependencies> + <dependency> + <groupId>org.apache.maven.doxia.ide</groupId> + <artifactId>dependencies</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + </dependencies> + <modules> <module>org.apache.maven.doxia.ide.eclipse.feature</module> </modules> - - <build> - <resources> - <resource> - <directory>${basedir}</directory> - <includes> - <include>feature.xml</include> - </includes> - </resource> - </resources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <configuration> - <projectnatures> - <projectnature>org.eclipse.pde.FeatureNature</projectnature> - </projectnatures> - <buildcommands> - <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand> - </buildcommands> - </configuration> - </plugin> - <!-- No tests to run --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <deployableFeature>true</deployableFeature> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>categorization</id> + <phase>package</phase> + <goals> + <goal>category-p2-metadata</goal> + </goals> + </execution> + </executions> + <configuration> + <metadataRepositoryName>Doxia Editor Plugins</metadataRepositoryName> + <artifactRepositoryName>Doxia Editor plugins</artifactRepositoryName> + <compressRepository>false</compressRepository> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml?rev=1162941&r1=1162940&r2=1162941&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml Mon Aug 29 18:44:11 2011 @@ -28,11 +28,6 @@ <layout>p2</layout> <url>http://download.eclipse.org/releases/helios</url> </repository> - <repository> - <id>doxia-p2</id> - <layout>p2</layout> - <url>http://svn.apache.org/repos/asf/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/interim-p2</url> - </repository> </repositories> <build> <pluginManagement>