You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/01/10 20:58:01 UTC
svn commit: r1650800 - in /directory/studio/branches/studio-tycho:
helps/ldifeditor.help/build.properties helps/ldifeditor.help/pom-first.xml
helps/ldifeditor.help/pom.xml helps/pom-first.xml helps/pom.xml
pom-first.xml pom.xml
Author: seelmann
Date: Sat Jan 10 19:58:01 2015
New Revision: 1650800
URL: http://svn.apache.org/r1650800
Log:
Migrate first help plugin. Switch to latest API snapshot.
Added:
directory/studio/branches/studio-tycho/helps/ldifeditor.help/build.properties
directory/studio/branches/studio-tycho/helps/ldifeditor.help/pom-first.xml
directory/studio/branches/studio-tycho/helps/pom-first.xml
Modified:
directory/studio/branches/studio-tycho/helps/ldifeditor.help/pom.xml
directory/studio/branches/studio-tycho/helps/pom.xml
directory/studio/branches/studio-tycho/pom-first.xml
directory/studio/branches/studio-tycho/pom.xml
Added: directory/studio/branches/studio-tycho/helps/ldifeditor.help/build.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/helps/ldifeditor.help/build.properties?rev=1650800&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/helps/ldifeditor.help/build.properties (added)
+++ directory/studio/branches/studio-tycho/helps/ldifeditor.help/build.properties Sat Jan 10 19:58:01 2015
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+ .
Added: directory/studio/branches/studio-tycho/helps/ldifeditor.help/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/helps/ldifeditor.help/pom-first.xml?rev=1650800&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/helps/ldifeditor.help/pom-first.xml (added)
+++ directory/studio/branches/studio-tycho/helps/ldifeditor.help/pom-first.xml Sat Jan 10 19:58:01 2015
@@ -0,0 +1,65 @@
+<?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.
+-->
+<!--
+ @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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.directory.studio</groupId>
+ <artifactId>parent-helps</artifactId>
+ <version>2.0.0.qualifier</version>
+ <relativePath>../pom-first.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.directory.studio.ldifeditor.help</artifactId>
+ <name>Apache Directory Studio LDIF Editor Help Manifest Generation</name>
+ <description/>
+ <packaging>bundle</packaging>
+
+ <build>
+ <!-- MANIFEST.MF Generation -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>!</Export-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Modified: directory/studio/branches/studio-tycho/helps/ldifeditor.help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/helps/ldifeditor.help/pom.xml?rev=1650800&r1=1650799&r2=1650800&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/helps/ldifeditor.help/pom.xml (original)
+++ directory/studio/branches/studio-tycho/helps/ldifeditor.help/pom.xml Sat Jan 10 19:58:01 2015
@@ -24,12 +24,14 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-helps</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>ldifeditor.help</artifactId>
+ <artifactId>org.apache.directory.studio.ldifeditor.help</artifactId>
<name>Apache Directory Studio LDIF Editor Help</name>
- <packaging>jar</packaging>
- <profiles>
+ <packaging>eclipse-plugin</packaging>
+
+ <profiles>
<!-- UserGuides -->
<profile>
<id>userguides</id>
@@ -79,6 +81,8 @@
</taskdef>
<!-- Prepare docbook -->
+ <unzip src="../../repository/docbook/docbook-xml/4.5/docbook-xml-4.5.zip" dest="target/docbook/docbook-xml" />
+ <unzip src="../../repository/docbook/docbook-xsl/1.71.1/docbook-xsl-1.71.1.zip" dest="target/docbook" />
<property name="fromregexpxml" value="^(docbook-xml-[^/]+)/(.*)" />
<property name="toregexpxml" value="docbook-xml/\2" />
<move todir="target/docbook">
@@ -162,243 +166,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>help-plugin</id>
- <activation>
- <file><exists>src/main/docbook/0_index.xml</exists></file>
- </activation>
- <build>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/docbook</directory>
- <targetPath>../docbook/documents</targetPath>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <buildcommands>
- <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
- <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
- </buildcommands>
- <projectnatures>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- </projectnatures>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>studio-maven-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <createManifest>true</createManifest>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>prepare-jar-package</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>META-INF/MANIFEST.MF</manifestFile>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
-
- <!-- MANIFEST.MF Generation -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>!</Export-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>generate-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-docbook-dependencies</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <overWrite>true</overWrite>
- <artifactItems>
- <artifactItem>
- <groupId>docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <type>zip</type>
- <outputDirectory>target/docbook/docbook-xml</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>docbook</groupId>
- <artifactId>docbook-xsl</artifactId>
- <type>zip</type>
- <outputDirectory>target/docbook</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>build-eclipse-help</id>
- <phase>process-classes</phase>
- <configuration>
- <target>
- <!-- Prepare docbook -->
- <property name="fromregexpxml" value="^(docbook-xml-[^/]+)/(.*)" />
- <property name="toregexpxml" value="docbook-xml/\2" />
- <move todir="target/docbook">
- <fileset dir="target/docbook">
- <include name="docbook-xml-*/**" />
- </fileset>
- <regexpmapper from="${fromregexpxml}" to="${toregexpxml}" handledirsep="true" />
- </move>
-
- <property name="fromregexpxsl" value="^(docbook-xsl-[^/]+)/(.*)" />
- <property name="toregexpxsl" value="docbook-xsl/\2" />
- <move todir="target/docbook">
- <fileset dir="target/docbook">
- <include name="docbook-xsl-*/**" />
- </fileset>
- <regexpmapper from="${fromregexpxsl}" to="${toregexpxsl}" handledirsep="true" />
- </move>
-
- <!-- Create HTML -->
- <xslt basedir="target/docbook/" in="target/docbook/documents/0_index.xml" out="target/classes/index.html" style="target/docbook/docbook-xsl/eclipse/eclipse.xsl">
- <param name="ignore.image.scaling" expression="1" />
- <param name="manifest.in.base.dir" expression="0" />
- <param name="base.dir" expression="html/" />
- <param name="html.stylesheet" expression="css/book.css" />
- <param name="table.cell.borders.thickness" expression="1" />
- <!-- <param name="table.borders.with.css" expression="1" /> -->
- <param name="generate.section.toc.level" expression="5" />
- <param name="toc.max.depth" expression="1" />
- <param name="chunk.first.sections" expression="1" />
- <param name="chunk.section.depth" expression="5" />
- <param name="chunk.fast" expression="1" />
- <param name="chunk.separate.lots" expression="1" />
- <!--<param name="chunk.tocs.and.lots" expression="1" />-->
- <param name="ulink.target" expression="_self" />
- <param name="suppress.navigation" expression="1" />
- <param name="html.cleanup" expression="1" />
- <param name="html.cellpadding" expression="3" />
- <param name="use.id.as.filename" expression="1" />
- <param name="chapter.autolabel" expression="0" />
- <param name="section.autolabel" expression="0" />
- <outputproperty name="method" value="xml" />
- <outputproperty name="standalone" value="yes" />
- <outputproperty name="encoding" value="iso8859_1" />
- <outputproperty name="indent" value="es" />
- </xslt>
-
- <!-- Copy the good plugin.xml.
- The eclipse.xsl creates its own plugin.xml but we want
- to use our own.
- -->
- <copy todir="target/classes" file="plugin.xml" overwrite="true" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- No tests to run -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <!-- MAVEN_DEFAULT_EXCLUDES -->
- <exclude>**/target/**/*</exclude>
- <exclude>**/cobertura.ser</exclude>
- <!-- ECLIPSE_DEFAULT_EXCLUDES -->
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**/*</exclude>
- <!-- IDEA_DEFAULT_EXCLUDES -->
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
- <!-- MANIFEST_MF_EXCLUDES -->
- <exclude>**/MANIFEST.MF</exclude>
- <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <!-- GITIGNORE_EXCLUDES -->
- <exclude>**/.gitignore</exclude>
- <!-- ABOUT_EXCLUDES -->
- <exclude>**/about.ini</exclude>
- <exclude>**/about_files/*</exclude>
- <!-- LOG_FILES_EXCLUDES -->
- <exclude>**/*.log</exclude>
- <exclude>**/*.vm</exclude>
- <!-- OTHER_EXCLUDES -->
- <exclude>src/main/resources/html/rfc/*.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
</profiles>
<build>
@@ -420,109 +187,16 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <buildcommands>
- <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
- <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
- </buildcommands>
- <projectnatures>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- </projectnatures>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>studio-maven-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <createManifest>true</createManifest>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>prepare-jar-package</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>META-INF/MANIFEST.MF</manifestFile>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
-
- <!-- MANIFEST.MF Generation -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>!</Export-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>generate-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-docbook-dependencies</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <overWrite>true</overWrite>
- <artifactItems>
- <artifactItem>
- <groupId>docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <type>zip</type>
- <outputDirectory>target/docbook/docbook-xml</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>docbook</groupId>
- <artifactId>docbook-xsl</artifactId>
- <type>zip</type>
- <outputDirectory>target/docbook</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>build-eclipse-help</id>
<phase>process-classes</phase>
<configuration>
- <tasks>
+ <target>
<!-- Prepare docbook -->
+ <unzip src="../../repository/docbook/docbook-xml/4.5/docbook-xml-4.5.zip" dest="target/docbook/docbook-xml" />
+ <unzip src="../../repository/docbook/docbook-xsl/1.71.1/docbook-xsl-1.71.1.zip" dest="target/docbook" />
<property name="fromregexpxml" value="^(docbook-xml-[^/]+)/(.*)" />
<property name="toregexpxml" value="docbook-xml/\2" />
<move todir="target/docbook">
@@ -574,7 +248,7 @@
to use our own.
-->
<copy todir="target/classes" file="plugin.xml" overwrite="true" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -582,15 +256,6 @@
</execution>
</executions>
</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>
Added: directory/studio/branches/studio-tycho/helps/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/helps/pom-first.xml?rev=1650800&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/helps/pom-first.xml (added)
+++ directory/studio/branches/studio-tycho/helps/pom-first.xml Sat Jan 10 19:58:01 2015
@@ -0,0 +1,163 @@
+<?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.
+-->
+<!--
+ @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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.directory.studio</groupId>
+ <artifactId>parent-setup</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath>../pom-first.xml</relativePath>
+ </parent>
+
+ <artifactId>parent-helps</artifactId>
+ <name>Apache Directory Studio Help Plugins Parent Manifest Generation</name>
+ <version>2.0.0.qualifier</version>
+ <packaging>pom</packaging>
+
+ <modules>
+<!-- <module>apacheds.help</module> -->
+<!-- <module>apacheds.configuration.help</module> -->
+<!-- <module>ldapbrowser.help</module> -->
+ <module>ldifeditor.help/pom-first.xml</module>
+<!-- <module>rcp.help</module> -->
+<!-- <module>schemaeditor.help</module> -->
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-resources</id>
+ <phase>none</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-testResources</id>
+ <phase>none</phase>
+ <goals>
+ <goal>testResources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <phase>none</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-testCompile</id>
+ <phase>none</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <phase>none</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <phase>none</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-install</id>
+ <phase>none</phase>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-deploy</id>
+ <phase>none</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-bundle</id>
+ <phase>none</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-install</id>
+ <phase>none</phase>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-deploy</id>
+ <phase>none</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Modified: directory/studio/branches/studio-tycho/helps/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/helps/pom.xml?rev=1650800&r1=1650799&r2=1650800&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/helps/pom.xml (original)
+++ directory/studio/branches/studio-tycho/helps/pom.xml Sat Jan 10 19:58:01 2015
@@ -24,6 +24,7 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
<artifactId>parent-helps</artifactId>
@@ -31,55 +32,97 @@
<packaging>pom</packaging>
<modules>
- <module>apacheds.help</module>
- <module>apacheds.configuration.help</module>
- <module>ldapbrowser.help</module>
+<!-- <module>apacheds.help</module> -->
+<!-- <module>apacheds.configuration.help</module> -->
+<!-- <module>ldapbrowser.help</module> -->
<module>ldifeditor.help</module>
- <module>rcp.help</module>
- <module>schemaeditor.help</module>
+<!-- <module>rcp.help</module> -->
+<!-- <module>schemaeditor.help</module> -->
</modules>
<build>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
<configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
+ <additionalFileSets>
+ <fileSet>
+ <directory>${project.build.directory}/classes/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </additionalFileSets>
+ </configuration>
+ </plugin>
+
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.8,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+
+<!-- <plugin> -->
+<!-- <groupId>org.apache.rat</groupId> -->
+<!-- <artifactId>apache-rat-plugin</artifactId> -->
+<!-- <configuration> -->
+<!-- <excludeSubProjects>false</excludeSubProjects> -->
+<!-- <excludes> -->
<!-- MAVEN_DEFAULT_EXCLUDES -->
- <exclude>**/target/**/*</exclude>
- <exclude>**/cobertura.ser</exclude>
+<!-- <exclude>**/target/**/*</exclude> -->
+<!-- <exclude>**/cobertura.ser</exclude> -->
<!-- ECLIPSE_DEFAULT_EXCLUDES -->
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**/*</exclude>
+<!-- <exclude>**/.classpath</exclude> -->
+<!-- <exclude>**/.project</exclude> -->
+<!-- <exclude>**/.settings/**/*</exclude> -->
<!-- IDEA_DEFAULT_EXCLUDES -->
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
+<!-- <exclude>**/*.iml</exclude> -->
+<!-- <exclude>**/*.ipr</exclude> -->
+<!-- <exclude>**/*.iws</exclude> -->
<!-- MANIFEST_MF_EXCLUDES -->
- <exclude>**/MANIFEST.MF</exclude>
+<!-- <exclude>**/MANIFEST.MF</exclude> -->
<!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
- <exclude>**/dependency-reduced-pom.xml</exclude>
+<!-- <exclude>**/dependency-reduced-pom.xml</exclude> -->
<!-- GITIGNORE_EXCLUDES -->
- <exclude>**/.gitignore</exclude>
+<!-- <exclude>**/.gitignore</exclude> -->
<!-- ABOUT_EXCLUDES -->
- <exclude>**/about.ini</exclude>
- <exclude>**/about_files/*</exclude>
+<!-- <exclude>**/about.ini</exclude> -->
+<!-- <exclude>**/about_files/*</exclude> -->
<!-- LOG_FILES_EXCLUDES -->
- <exclude>**/*.log</exclude>
- <exclude>**/*.vm</exclude>
+<!-- <exclude>**/*.log</exclude> -->
+<!-- <exclude>**/*.vm</exclude> -->
<!-- NSIS_EXCLUDES -->
- <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude>
+<!-- <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude> -->
<!-- OTHER_EXCLUDES -->
- <exclude>ldapbrowser.help/src/main/resources/sevenseas.ldif</exclude>
- <exclude>**/src/main/resources/html/rfc/*.txt</exclude>
- <exclude>**/src/main/resources/html/rfcs/*.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
+<!-- <exclude>ldapbrowser.help/src/main/resources/sevenseas.ldif</exclude> -->
+<!-- <exclude>**/src/main/resources/html/rfc/*.txt</exclude> -->
+<!-- <exclude>**/src/main/resources/html/rfcs/*.txt</exclude> -->
+<!-- </excludes> -->
+<!-- </configuration> -->
+<!-- </plugin> -->
</plugins>
</pluginManagement>
</build>
Modified: directory/studio/branches/studio-tycho/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/pom-first.xml?rev=1650800&r1=1650799&r2=1650800&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/pom-first.xml (original)
+++ directory/studio/branches/studio-tycho/pom-first.xml Sat Jan 10 19:58:01 2015
@@ -35,6 +35,7 @@
<modules>
<module>eclipse-target-platform/pom.xml</module>
<module>plugins/pom-first.xml</module>
+ <module>helps/pom-first.xml</module>
</modules>
<build>
Modified: directory/studio/branches/studio-tycho/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/pom.xml?rev=1650800&r1=1650799&r2=1650800&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/pom.xml (original)
+++ directory/studio/branches/studio-tycho/pom.xml Sat Jan 10 19:58:01 2015
@@ -80,8 +80,8 @@
<!-- <org.apache.commons.logging.version>1.1.3</org.apache.commons.logging.version> -->
<org.apache.commons.pool.version>1.6</org.apache.commons.pool.version>
<org.apache.commons.pool.bundleversion>1.6.0</org.apache.commons.pool.bundleversion>
- <org.apache.directory.api.version>1.0.0-M28</org.apache.directory.api.version>
- <org.apache.directory.api.bundleversion>1.0.0.M28</org.apache.directory.api.bundleversion>
+ <org.apache.directory.api.version>1.0.0-M29-SNAPSHOT</org.apache.directory.api.version>
+ <org.apache.directory.api.bundleversion>1.0.0.M29-SNAPSHOT</org.apache.directory.api.bundleversion>
<!-- <org.apache.directory.server.validversion>2.0.0.M17</org.apache.directory.server.validversion> -->
<org.apache.directory.server.version>2.0.0-M20-SNAPSHOT</org.apache.directory.server.version>
<org.apache.directory.server.bundleversion>2.0.0.M20-SNAPSHOT</org.apache.directory.server.bundleversion>
@@ -90,7 +90,7 @@
<log4j.log4j.bundleversion>1.2.17</log4j.log4j.bundleversion>
<org.apache.mina.version>2.0.9</org.apache.mina.version>
<org.apache.mina.bundleversion>2.0.9</org.apache.mina.bundleversion>
-<!-- <org.apache.xmlgraphics.fop.version>1.0</org.apache.xmlgraphics.fop.version> -->
+ <org.apache.xmlgraphics.fop.version>1.0</org.apache.xmlgraphics.fop.version>
<org.bouncycastle.bcprov.jdk15.version>140</org.bouncycastle.bcprov.jdk15.version>
<org.bouncycastle.bcprov.jdk15.bundleversion>140.0.0</org.bouncycastle.bcprov.jdk15.bundleversion>
<org.slf4j.version>1.7.10</org.slf4j.version>
@@ -123,6 +123,7 @@
<modules>
<module>plugins</module>
+ <module>helps</module>
</modules>
<build>
@@ -208,6 +209,51 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-regexp</artifactId>
+ <version>1.7.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>optional</artifactId>
+ <version>1.5.4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop</artifactId>
+ <version>${org.apache.xmlgraphics.fop.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!--
+ Putting this dependency in the core pom produces following error (?):
+ Embedded error: java.lang.ClassCastException: org.apache.fop.render.pdf.PDFRendererMaker cannot be cast to org.apache.fop.render.AbstractRendererMaker
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>xmlgraphics-commons</artifactId>
+ <version>1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ -->
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -2264,51 +2310,6 @@
<!-- </plugin> -->
<!-- <plugin> -->
-<!-- <groupId>org.apache.maven.plugins</groupId> -->
-<!-- <artifactId>maven-antrun-plugin</artifactId> -->
-<!-- <dependencies> -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.ant</groupId> -->
-<!-- <artifactId>ant-apache-regexp</artifactId> -->
-<!-- <version>1.7.1</version> -->
-<!-- <scope>compile</scope> -->
-<!-- </dependency> -->
-
-<!-- <dependency> -->
-<!-- <groupId>xalan</groupId> -->
-<!-- <artifactId>xalan</artifactId> -->
-<!-- <version>2.7.0</version> -->
-<!-- <scope>compile</scope> -->
-<!-- </dependency> -->
-
-<!-- <dependency> -->
-<!-- <groupId>ant</groupId> -->
-<!-- <artifactId>optional</artifactId> -->
-<!-- <version>1.5.4</version> -->
-<!-- <scope>compile</scope> -->
-<!-- </dependency> -->
-
-<!-- <dependency> -->
-<!-- <groupId>org.apache.xmlgraphics</groupId> -->
-<!-- <artifactId>fop</artifactId> -->
-<!-- <version>${org.apache.xmlgraphics.fop.version}</version> -->
-<!-- <scope>compile</scope> -->
-<!-- </dependency> -->
-
- <!--
- Putting this dependency in the core pom produces following error (?):
- Embedded error: java.lang.ClassCastException: org.apache.fop.render.pdf.PDFRendererMaker cannot be cast to org.apache.fop.render.AbstractRendererMaker
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>xmlgraphics-commons</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
- -->
-<!-- </dependencies> -->
-<!-- </plugin> -->
-
-<!-- <plugin> -->
<!-- <groupId>org.apache.rat</groupId> -->
<!-- <artifactId>apache-rat-plugin</artifactId> -->
<!-- <configuration> -->