You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2011/09/03 14:07:15 UTC
svn commit: r1164850 - in /maven/sandbox/trunk/doxia/doxia-ide/eclipse:
README.TXT eclipse-plugins/pom.xml pom.xml update-site/.project
Author: vsiveton
Date: Sat Sep 3 12:07:14 2011
New Revision: 1164850
URL: http://svn.apache.org/viewvc?rev=1164850&view=rev
Log:
o improved Maven build
o improved Eclipse layout
Modified:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/README.TXT
maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/update-site/.project
Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/README.TXT
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/README.TXT?rev=1164850&r1=1164849&r2=1164850&view=diff
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-ide/eclipse/README.TXT (original)
+++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/README.TXT Sat Sep 3 12:07:14 2011
@@ -1,12 +1,21 @@
Eclipse plugin for Apache Maven Doxia
-Structure:
+Build with Maven:
+Tycho (http://tycho.sonatype.org) won't resolve through the reactor for the bundle, so you need to build firstly org.apache.maven.doxia.eclipse.dependencies project:
- org.apache.maven.doxia.eclipse.dependencies bundles: up doxia and dependencies as an OSGi plugin.
-
+mvn clean install -f doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
+|_ Make an OSGi bundle of doxia.
+mvn clean install
+|_ Create a feature and a P2 repository
+|_ Eclipse plugins
+Using Eclipse IDE:
+File/import/Existing projects in workspace/${basedir}
+
+Other comments:
1162393 is the rev which demos m-e-p editing MANIFEST.MF (!)
+TO BE REVIEWED:
Required Prerequisites:
* Eclipse SDK Platform (http://download.eclipse.org/eclipse/downloads/)
@@ -16,21 +25,15 @@ Required Prerequisites:
- GEF
- DTP
- WTP Tool Developers
-* doxia-converter (https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-converter)
- - Need to build it
- - Put apache-doxia-1.0-SNAPSHOT-jar-with-dependencies.jar in ./plugins/org.apache.maven.doxia.ide.eclipse.common.ui/lib - unneeded since r650510
-* needs Java 5 to build since Eclipse uses Java 5
-* M2_HOME needs to be set - unneeded since r651102
Known Limitations:
* Needs to bump to WSTP M6 due to:
- https://bugs.eclipse.org/bugs/show_bug.cgi?id=212330
- https://bugs.eclipse.org/bugs/show_bug.cgi?id=224040
-TODO:
-* mavenize the plugins - done in r650510
-* Add more PatternRule for text plugin (Apt, confluence, twiki) - done in r650506, r650503, r650502
-* Review editor colors - done in r650501
+Improvements:
+* review POM groupId
+* fixed icons and label
* add more actions like add list, comment/uncomment in Apt...
References:
Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/pom.xml?rev=1164850&r1=1164849&r2=1164850&view=diff
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/pom.xml (original)
+++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/pom.xml Sat Sep 3 12:07:14 2011
@@ -1,115 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>3.0.3</maven>
- </prerequisites>
- <parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>21</version>
- <relativePath/>
- </parent>
+
+<!--
+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.
+-->
+
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
<groupId>org.apache.maven.doxia.ide</groupId>
- <artifactId>eclipse-plugins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <description>The eclipse plugins, features, and update site are here.
- </description>
- <properties>
- <tycho-version>0.12.0</tycho-version>
- </properties>
- <modules>
- <module>plugins</module>
- </modules>
- <repositories>
- <repository>
- <id>helios</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/helios</url>
- </repository>
- </repositories>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <projectNameTemplate>${project.groupId}-${project.artifactId}</projectNameTemplate>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>false</downloadJavadocs>
- <additionalBuildcommands>
- <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
- <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
- </additionalBuildcommands>
- <additionalProjectnatures>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- <projectnature>org.eclipse.jdt.core.javanature</projectnature>
- </additionalProjectnatures>
- <classpathContainers>
- <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
- <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
- </classpathContainers>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <pomDependencies>consider</pomDependencies>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>carbon</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <artifactId>eclipse-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>eclipse-plugins</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <description>The eclipse plugins, features, and update site are here.</description>
+
+ <properties>
+ <tycho-version>0.12.0</tycho-version>
+ </properties>
+
+ <modules>
+ <module>plugins</module>
+ <module>features</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>helios</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/helios</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>carbon</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml?rev=1164850&r1=1164849&r2=1164850&view=diff
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml (original)
+++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml Sat Sep 3 12:07:14 2011
@@ -23,191 +23,44 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>21</version>
- <relativePath/>
+ <!-- ideally Doxia parent pom -->
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-parent</artifactId>
+ <version>21</version>
+ <relativePath/>
</parent>
<groupId>org.apache.maven.doxia.ide</groupId>
- <artifactId>eclipse</artifactId>
+ <artifactId>eclipse-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Doxia Tools :: Eclipse IDE - Parent POM</name>
<description>Parent POM for the defacto IDE for Doxia development</description>
+
+ <prerequisites>
+ <maven>3.0.3</maven>
+ </prerequisites>
+
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/trunk/doxia/doxia-ide/eclipse</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/trunk/doxia/doxia-ide/eclipse</developerConnection>
- <url>https://svn.apache.org/repos/asf/maven/sandbox/trunk/doxia/doxia-ide</url>
+ <url>https://svn.apache.org/repos/asf/maven/sandbox/trunk/doxia/doxia-ide/eclipse</url>
</scm>
- <prerequisites>
- <maven>2.0.9</maven>
- </prerequisites>
-
<properties>
<libdir>${project.build.outputDirectory}/lib</libdir>
<manifestdir>${project.build.outputDirectory}/META-INF</manifestdir>
- <doxiaVersion>1.1.2</doxiaVersion>
- <doxiaConverterVersion>1.2</doxiaConverterVersion>
+ <maven-bundle-plugin-version>2.3.5</maven-bundle-plugin-version>
</properties>
+ <modules>
+ <module>doxia-osgi</module>
+ <module>eclipse-plugins</module>
+ </modules>
+
<dependencyManagement>
<dependencies>
- <!-- Doxia -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-converter</artifactId>
- <version>${doxiaConverterVersion}</version>
- <classifier>jar-with-dependencies</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-sink-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-apt</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-confluence</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-docbook-simple</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-fml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-fo</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-latex</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-itext</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-rtf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-twiki</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xdoc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xhtml</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-sink-api</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-logging-api</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-apt</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-confluence</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-docbook-simple</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-fml</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-fo</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-itext</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-latex</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-rtf</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-twiki</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xdoc</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xhtml</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
-
<!-- Eclipse SDK: see MNG-3518 -->
<dependency>
<groupId>org.eclipse.core</groupId>
@@ -344,7 +197,7 @@ under the License.
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>${maven-bundle-plugin-version}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -359,11 +212,6 @@ under the License.
</plugins>
</build>
- <modules>
- <module>plugins</module>
- <module>features</module>
- </modules>
-
<!-- Eclipse dependencyManagement OS specific -->
<profiles>
<profile>
@@ -478,41 +326,6 @@ under the License.
</dependencyManagement>
</profile>
<profile>
- <!-- MNG-3518 workaround -->
- <id>download-eclipse</id>
- <activation>
- <file>
- <!-- Be sure that eclipse:to-maven was already called with stripQualifier option -->
- <missing>${user.home}/.m2/repository/org/eclipse/wst/sse/core/1.1.203/core-1.1.203.jar</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <configuration>
- <target>
- <subant target="">
- <property name="download.dir" value="${java.io.tmpdir}" />
- <property name="install.dir" value="${java.io.tmpdir}" />
- <fileset dir="${basedir}" includes="download-eclipse.xml" />
- </subant>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>to-eclipse</id>
<build>
<defaultGoal>validate</defaultGoal>
Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/update-site/.project
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/update-site/.project?rev=1164850&r1=1164849&r2=1164850&view=diff
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-ide/eclipse/update-site/.project (original)
+++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/update-site/.project Sat Sep 3 12:07:14 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.maven.doxia.ide.eclipse.site</name>
+ <name>org.apache.maven.doxia.ide.eclipse.update-site</name>
<comment></comment>
<projects>
</projects>