You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/03/08 20:21:34 UTC
svn commit: r920465 - /myfaces/core/trunk/impl/pom.xml
Author: jakobk
Date: Mon Mar 8 19:21:34 2010
New Revision: 920465
URL: http://svn.apache.org/viewvc?rev=920465&view=rev
Log:
MYFACES-2579 Support the dynamic adding of servlets and servlet-mappings on Servlet API 3.0 to make web.xml entries for Faces Servlet not mandatory (modified impl pom to include implee6 at build)
Modified:
myfaces/core/trunk/impl/pom.xml
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/pom.xml?rev=920465&r1=920464&r2=920465&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Mon Mar 8 19:21:34 2010
@@ -347,7 +347,7 @@
<version>1.0</version>
<executions>
<execution>
- <id>add-source</id>
+ <id>add-source-shared</id>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
@@ -364,6 +364,94 @@
</build>
</profile>
<profile>
+ <id>unpack-impl-ee6</id>
+ <activation>
+ <property>
+ <name>!dev</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!--
+ - The implee6 project contains classes which need Java EE 6 dependencies.
+ - The result is a jar that we can merge into the jar for this project.
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>unpack-impl-ee6</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl-ee6</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <!-- Just include the .class files in org/** and the META-INF/services directory -->
+ <includes>org/**,META-INF/services/**</includes>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-impl-ee6-sources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl-ee6</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ <!-- Just include the .java files in org/** and the META-INF/services directory -->
+ <includes>org/**,META-INF/services/**</includes>
+ <outputDirectory>${project.build.directory}/implee6_sources</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!--
+ - Add the unpacked implee6 sources directory as source directory into the pom datastructure,
+ - so that the -source jar includes them too; every .class file in the jar should have its
+ - source in the -source jar.
+ - This has to happen after the "real" sources have been compiled, otherwise the compilation
+ - would fail because of wrong dependencies.
+ -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-source-implee6</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/implee6_sources</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>generate-tlddoc</id>
<build>
<plugins>