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:26 UTC
svn commit: r369032 - in /myfaces/tomahawk/trunk: tomahawk-assembly/pom.xml
tomahawk-assembly/src/main/assembly/dep.xml tomahawk/pom.xml
tomahawk/src/main/tld/misc/resolve_entities-tlddoc.xsl
Author: bommel
Date: Sat Jan 14 07:14:18 2006
New Revision: 369032
URL: http://svn.apache.org/viewcvs?rev=369032&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
Added:
myfaces/tomahawk/trunk/tomahawk/src/main/tld/misc/resolve_entities-tlddoc.xsl
Modified:
myfaces/tomahawk/trunk/tomahawk-assembly/pom.xml
myfaces/tomahawk/trunk/tomahawk-assembly/src/main/assembly/dep.xml
myfaces/tomahawk/trunk/tomahawk/pom.xml
Modified: myfaces/tomahawk/trunk/tomahawk-assembly/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tomahawk-assembly/pom.xml?rev=369032&r1=369031&r2=369032&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/tomahawk-assembly/pom.xml (original)
+++ myfaces/tomahawk/trunk/tomahawk-assembly/pom.xml Sat Jan 14 07:14:18 2006
@@ -1,7 +1,7 @@
-<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">
+<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>
-
<groupId>org.apache.myfaces</groupId>
<artifactId>tomahawk-assembly</artifactId>
<packaging>pom</packaging>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces</artifactId>
+ <artifactId>myfaces-tomahawk</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
@@ -21,6 +21,60 @@
<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>tomahawk</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>tomahawk</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>
<version>2.0-beta-1</version>
<configuration>
@@ -34,12 +88,13 @@
</plugins>
</build>
+
<dependencies>
- <dependency>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk</artifactId>
- <version>${version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
</project>
Modified: myfaces/tomahawk/trunk/tomahawk-assembly/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tomahawk-assembly/src/main/assembly/dep.xml?rev=369032&r1=369031&r2=369032&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/tomahawk-assembly/src/main/assembly/dep.xml (original)
+++ myfaces/tomahawk/trunk/tomahawk-assembly/src/main/assembly/dep.xml Sat Jan 14 07:14:18 2006
@@ -21,5 +21,19 @@
<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/tomahawk/trunk/tomahawk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tomahawk/pom.xml?rev=369032&r1=369031&r2=369032&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/tomahawk/pom.xml (original)
+++ myfaces/tomahawk/trunk/tomahawk/pom.xml Sat Jan 14 07:14:18 2006
@@ -206,4 +206,76 @@
</reporting>
+ <profiles>
+ <profile>
+ <id>generate-site</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xslt-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <configuration>
+ <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
+ <srcIncludes>**/*.tld</srcIncludes>
+ <srcDir>src/main/tld</srcDir>
+ <destDir>target/tlddoc-site</destDir>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <configuration>
+ <taglib.src.dir>${basedir}/target/tlddoc-site</taglib.src.dir>
+ <tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ <profile>
+ <id>generate-assembly</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <goals><goal>jar</goal></goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <configuration>
+ <taglib.src.dir>${basedir}/target/classes/META-INF</taglib.src.dir>
+ <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <goals><goal>taglibdocjar</goal></goals>
+ </execution>
+ </executions>
+ </plugin-->
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Added: myfaces/tomahawk/trunk/tomahawk/src/main/tld/misc/resolve_entities-tlddoc.xsl
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tomahawk/src/main/tld/misc/resolve_entities-tlddoc.xsl?rev=369032&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/tomahawk/src/main/tld/misc/resolve_entities-tlddoc.xsl (added)
+++ myfaces/tomahawk/trunk/tomahawk/src/main/tld/misc/resolve_entities-tlddoc.xsl Sat Jan 14 07:14:18 2006
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ - Stylesheet to expand xml entity references inline.
+ -
+ -->
+<xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <xsl:output method="xml"
+ encoding="ISO-8859-1"
+ doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ doctype-system="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"
+ indent="yes"/>
+
+ <xsl:template match="*" priority="2">
+ <!-- avoiding copy to get get rid of namespace attribute -->
+ <xsl:element name="{name(.)}">
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>