You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/01/14 16:14:01 UTC
svn commit: r369029 - in /myfaces/api/trunk: myfaces-assembly/pom.xml
myfaces-assembly/src/main/assembly/dep.xml pom.xml
Author: bommel
Date: Sat Jan 14 07:13:55 2006
New Revision: 369029
URL: http://svn.apache.org/viewcvs?rev=369029&view=rev
Log:
added javadoc for assembly generate javadoc artifact with profile generate-assembly mvn -Pgenerate-assembly
added separate xsl for generate separate tld for the tlddoc
added tlddoc to site enable with profile generate-site mvn -Pgenerate-site
fixed missing java.lang in type of some attributes.xml in sandbox
Modified:
myfaces/api/trunk/myfaces-assembly/pom.xml
myfaces/api/trunk/myfaces-assembly/src/main/assembly/dep.xml
myfaces/api/trunk/pom.xml
Modified: myfaces/api/trunk/myfaces-assembly/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/myfaces-assembly/pom.xml?rev=369029&r1=369028&r2=369029&view=diff
==============================================================================
--- myfaces/api/trunk/myfaces-assembly/pom.xml (original)
+++ myfaces/api/trunk/myfaces-assembly/pom.xml Sat Jan 14 07:13:55 2006
@@ -19,6 +19,65 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-commons</artifactId>
+ <!-- TODO find one way to define the common version -->
+ <version>1.1.2-SNAPSHOT</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+ </configuration>
+ </execution>
+
+ <!--execution>
+ <id>copy-tlddoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${version}</version>
+ <classifier>tlddoc</classifier>
+ </artifactItem>
+
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/tlddoc</outputDirectory>
+ </configuration>
+ </execution-->
+
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -37,12 +96,12 @@
<dependencies>
- <dependency>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
-
+
</project>
Modified: myfaces/api/trunk/myfaces-assembly/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/myfaces-assembly/src/main/assembly/dep.xml?rev=369029&r1=369028&r2=369029&view=diff
==============================================================================
--- myfaces/api/trunk/myfaces-assembly/src/main/assembly/dep.xml (original)
+++ myfaces/api/trunk/myfaces-assembly/src/main/assembly/dep.xml Sat Jan 14 07:13:55 2006
@@ -21,5 +21,20 @@
<include>NOTICE*</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>target/javadoc</directory>
+ <outputDirectory>javadoc</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <!--fileSet>
+ <directory>target/tlddoc</directory>
+ <outputDirectory>tlddoc</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet-->
+
</fileSets>
</assembly>
Modified: myfaces/api/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/pom.xml?rev=369029&r1=369028&r2=369029&view=diff
==============================================================================
--- myfaces/api/trunk/pom.xml (original)
+++ myfaces/api/trunk/pom.xml Sat Jan 14 07:13:55 2006
@@ -22,6 +22,18 @@
<build>
<defaultGoal>install</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.1.2</version>
+ <!--configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration-->
+ </plugin>
+ </plugins>
+
<extensions>
<!-- Note: We're using scpexe protocol instead of scp because
jsch has an issue (already reported) that makes it fail.