You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/03/11 22:11:00 UTC
svn commit: r1080760 [1/2] - in /myfaces: core/branches/1.1.x/
core/branches/1.1.x/api/ core/branches/1.1.x/assembly/
core/branches/1.1.x/assembly/src/main/assembly/
core/branches/1.1.x/assembly/src/main/resources/ core/branches/1.1.x/impl/
shared/trun...
Author: lu4242
Date: Fri Mar 11 21:10:59 2011
New Revision: 1080760
URL: http://svn.apache.org/viewvc?rev=1080760&view=rev
Log:
update branch to nexus release procedure
Added:
myfaces/core/branches/1.1.x/assembly/src/main/assembly/corebin.xml
myfaces/core/branches/1.1.x/assembly/src/main/assembly/coresrc.xml
Removed:
myfaces/core/branches/1.1.x/assembly/src/main/assembly/bin.xml
myfaces/core/branches/1.1.x/assembly/src/main/assembly/src.xml
Modified:
myfaces/core/branches/1.1.x/api/pom.xml
myfaces/core/branches/1.1.x/assembly/pom.xml
myfaces/core/branches/1.1.x/assembly/src/main/resources/NOTICE.txt
myfaces/core/branches/1.1.x/impl/pom.xml
myfaces/core/branches/1.1.x/pom.xml
myfaces/shared/trunk_2.0.x/core/pom.xml
myfaces/shared/trunk_2.0.x/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
myfaces/shared/trunk_2.0.x/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
myfaces/shared/trunk_2.0.x/pom.xml
myfaces/shared/trunk_2.0.x/shared-impl/pom.xml
myfaces/shared/trunk_2.0.x/shared-orchestra/ (props changed)
myfaces/shared/trunk_2.0.x/shared-orchestra/pom.xml
myfaces/shared/trunk_2.0.x/shared-tomahawk/pom.xml
Modified: myfaces/core/branches/1.1.x/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.1.x/api/pom.xml?rev=1080760&r1=1080759&r2=1080760&view=diff
==============================================================================
--- myfaces/core/branches/1.1.x/api/pom.xml (original)
+++ myfaces/core/branches/1.1.x/api/pom.xml Fri Mar 11 21:10:59 2011
@@ -1,285 +1,284 @@
+<?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.
+-->
<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">
- <parent>
- <artifactId>myfaces-core-project</artifactId>
+
+ <parent>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-core-project</artifactId>
+ <version>1.1.9-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.myfaces.core</groupId>
- <version>1.1.9-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <name>Apache MyFaces JSF-1.1 API</name>
- <description>
- The public API classes of the Apache MyFaces Core JSF-1.1 project.
- </description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/api</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/api</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/trunk/api</url>
- </scm>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.vm</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.3</version>
- <executions>
- <execution>
- <goals>
- <goal>build-metadata</goal>
- </goals>
- </execution>
- <execution>
- <id>makecomp</id>
- <goals>
- <goal>make-components</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <artifactId>myfaces-api</artifactId>
+ <name>Apache MyFaces JSF-1.1 API</name>
+ <description>
+ The public API classes of the Apache MyFaces Core JSF-1.1 project.
+ </description>
+ <url>http://myfaces.apache.org/core11/myfaces-api</url>
- <profiles>
- <profile>
- <id>generate-assembly</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/1.1.x/api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/1.1.x/api</developerConnection>
+ <url>http://svn.apache.org/repos/asf/myfaces/core/branches/1.1.x/api</url>
+ </scm>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>**/*.vm</exclude>
+ </excludes>
+ </resource>
+ </resources>
<plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+
+ <!-- myfaces-builder-plugin for metadata and component classes -->
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build-metadata</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makecomp</id>
+ <goals>
+ <goal>make-components</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
- </build>
- </profile>
- <profile>
- <!--
- - Apply the MyFaces core 1.1 code generation approach. Here, an ant task is executed to
- - scan the sources directory for component and tag classes with special markers in them,
- - and modify those java files in-place, adding properties etc. The modified classes are
- - then checked back in; this task therefore only needs to be run when the config files
- - that drives the code generation are modified.
+
+ </build>
+
+
+ <profiles>
+
+ <!-- TODO jakobk: we could change this to -Papache-release -->
+ <!--
+ - Generate files that are good to have when doing a release to main
+ - repositories, but which are not wanted when doing a quick
+ - "mvn install" before testing some code modifications.
-->
- <id>regenerate-component-code</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>regenerate-component-code-parts</id>
- <phase>process-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property value="${project.basedir}/src/main/java" name="src.dir" />
- <ant inheritRefs="true" inheritAll="true" antfile="build.xml" dir="${project.basedir}">
- <target name="generate-components" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.maven</groupId>
- <artifactId>build-tools</artifactId>
- <version>1.0.7-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profile>
+ <id>generate-assembly</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<profile>
- <id>checkJDK</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet</groupId>
- <artifactId>animal-sniffer</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <signature>
- <groupId>org.jvnet.animal-sniffer</groupId>
- <artifactId>java1.4</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <pluginRepositories>
- <pluginRepository>
- <id>java.net.repo</id>
- <name>java.net repository</name>
- <url>http://download.java.net/maven/2/</url>
- </pluginRepository>
- </pluginRepositories>
- <repositories>
- <repository>
- <id>java.net.repo</id>
- <name>java.net repository</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- </repositories>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.struts.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.0</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>jsp-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.2.1</version>
- <scope>test</scope>
- </dependency>
+ <!-- This plugin verifies the binary compablity with the jsf api of the RI
+ TODO: add this to the normal build if 2.1 (or higher) of clirr-maven-plugin is released
+ In the meantime to use this plugin it must be installed manually from
+ https://svn.codehaus.org/mojo/trunk/mojo/clirr-maven-plugin
+ There is also a pending bug which patch must be applied before using this plugin:
+ http://jira.codehaus.org/browse/MCLIRR-5 -->
+ <id>checkCompability</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <comparisonArtifacts>
+ <comparisonArtifact>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.1_02</version>
+ </comparisonArtifact>
+ </comparisonArtifacts>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- check for Java 1.4 -->
+ <profile>
+ <id>checkJDK</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jvnet</groupId>
+ <artifactId>animal-sniffer</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <signature>
+ <groupId>org.jvnet.animal-sniffer</groupId>
+ <artifactId>java1.4</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- mojarra is only available on java.net -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>java.net.repo</id>
+ <name>java.net repository</name>
+ <url>http://download.java.net/maven/2/</url>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ </profiles>
+
+
+ <dependencies>
+
+ <!-- Servlet 2.3 -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <!-- JSP 2.0 -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+
+ <!-- JSTL 1.1 -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+
+ </dependency>
+
+ <!-- TEST DEPENDENCIES -->
+
+ <dependency>
+ <groupId>org.apache.struts.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ </dependency>
+
+ <!-- easymock -->
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <reportSets>
- <reportSet>
- <id>dual-report</id>
- <configuration>
- <type>range</type>
- <range>30</range>
- </configuration>
- <reports>
- <report>changelog</report>
- <report>file-activity</report>
- <report>dev-activity</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- </plugins>
- </reporting>
+
+
+ <reporting>
+
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>2.2</version>
+ <reportSets>
+ <reportSet>
+ <id>dual-report</id>
+ <configuration>
+ <type>range</type>
+ <range>30</range>
+ </configuration>
+ <reports>
+ <report>changelog</report>
+ <report>file-activity</report>
+ <report>dev-activity</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ </plugins>
+
+ </reporting>
+
</project>
Modified: myfaces/core/branches/1.1.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.1.x/assembly/pom.xml?rev=1080760&r1=1080759&r2=1080760&view=diff
==============================================================================
--- myfaces/core/branches/1.1.x/assembly/pom.xml (original)
+++ myfaces/core/branches/1.1.x/assembly/pom.xml Fri Mar 11 21:10:59 2011
@@ -1,13 +1,22 @@
-<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">
+<?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.
+-->
+<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.myfaces.core</groupId>
- <artifactId>myfaces-core-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
- </parent>
-
<artifactId>myfaces-core-assembly</artifactId>
<packaging>pom</packaging>
<name>Apache MyFaces JSF-1.1 Core Assembly</name>
@@ -16,24 +25,31 @@
by other modules.
</description>
+ <parent>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-core-project</artifactId>
+ <version>1.1.9-SNAPSHOT</version>
+ </parent>
+
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/assembly</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/assembly</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/trunk/assembly</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/1.1.x/assembly</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/1.1.x/assembly</developerConnection>
+ <url>http://svn.apache.org/repos/asf/myfaces/core/branches/1.1.x/assembly</url>
</scm>
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
<executions>
<execution>
<id>copy-javadoc</id>
<phase>package</phase>
<goals>
- <goal>unpack</goal>
+ <goal>copy</goal>
</goals>
<configuration>
<artifactItems>
@@ -42,63 +58,79 @@
<artifactId>myfaces-api</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
- <outputDirectory>${project.build.directory}/javadoc/api</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
- <outputDirectory>${project.build.directory}/javadoc/impl</outputDirectory>
</artifactItem>
+ <!--
+ TODO/CHECK: o.a.m.shared_impl.* javadoc automatically included?
+ <artifactItem>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ <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>unpack</goal>
+ <goal>copy</goal>
</goals>
<configuration>
<artifactItems>
+
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${project.version}</version>
<classifier>tlddoc</classifier>
</artifactItem>
+
</artifactItems>
<outputDirectory>${project.build.directory}/tlddoc</outputDirectory>
</configuration>
- </execution>
-
+ </execution>
<execution>
<id>copy-source</id>
<phase>package</phase>
<goals>
- <goal>unpack</goal>
+ <goal>copy</goal>
</goals>
<configuration>
<artifactItems>
- <artifactItem>
+ <artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${project.version}</version>
- <classifier>sources</classifier>
+ <classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${project.version}</version>
- <classifier>sources</classifier>
+ <classifier>sources</classifier>
</artifactItem>
- <artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-core-project</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <classifier>source-release</classifier>
+ </artifactItem>
+ <artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>2.0.7-SNAPSHOT</version>
- <classifier>sources</classifier>
+ <artifactId>myfaces-shared-project</artifactId>
+ <version>${myfaces-shared.version}</version>
+ <type>zip</type>
+ <classifier>source-release</classifier>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/src</outputDirectory>
@@ -108,17 +140,81 @@
</plugin>
<plugin>
+ <!-- EXECUTE mvn package to generate assembly files -->
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <finalName>myfaces-core-${project.version}</finalName>
- <outputDirectory>target/assembly/out</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
+ <executions>
+ <execution>
+ <id>make_assembly_src</id>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/coresrc.xml</descriptor>
+ </descriptors>
+ <finalName>myfaces-core-${project.version}-src</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>make_assembly_bin</id>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/corebin.xml</descriptor>
+ </descriptors>
+ <finalName>myfaces-core-${project.version}-bin</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/assembly/out/myfaces-core-${project.version}-bin.zip</file>
+ <type>zip</type>
+ <classifier>bin</classifier>
+ </artifact>
+ <artifact>
+ <file>target/assembly/out/myfaces-core-${project.version}-bin.tar.gz</file>
+ <type>tar.gz</type>
+ <classifier>bin</classifier>
+ </artifact>
+ <artifact>
+ <file>target/assembly/out/myfaces-core-${project.version}-src.zip</file>
+ <type>zip</type>
+ <classifier>src</classifier>
+ </artifact>
+ <artifact>
+ <file>target/assembly/out/myfaces-core-${project.version}-src.tar.gz</file>
+ <type>tar.gz</type>
+ <classifier>src</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -127,7 +223,7 @@
<version>1.0.6</version>
<configuration>
<id>myfaces-nightly-builds</id>
- <url>scpexe://minotaur.apache.org/www/people.apache.org/builds/myfaces/nightly</url>
+ <url>scpexe://minotaur.apache.org/www/cvs.apache.org/builds/myfaces/nightly</url>
<inputDirectory>target/assembly/out</inputDirectory>
</configuration>
</plugin>
@@ -150,7 +246,6 @@
<version>${project.version}</version>
</dependency>
-
</dependencies>
</project>
Added: myfaces/core/branches/1.1.x/assembly/src/main/assembly/corebin.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.1.x/assembly/src/main/assembly/corebin.xml?rev=1080760&view=auto
==============================================================================
--- myfaces/core/branches/1.1.x/assembly/src/main/assembly/corebin.xml (added)
+++ myfaces/core/branches/1.1.x/assembly/src/main/assembly/corebin.xml Fri Mar 11 21:10:59 2011
@@ -0,0 +1,39 @@
+<assembly>
+ <id>corebin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>RELEASE*</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>
Added: myfaces/core/branches/1.1.x/assembly/src/main/assembly/coresrc.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.1.x/assembly/src/main/assembly/coresrc.xml?rev=1080760&view=auto
==============================================================================
--- myfaces/core/branches/1.1.x/assembly/src/main/assembly/coresrc.xml (added)
+++ myfaces/core/branches/1.1.x/assembly/src/main/assembly/coresrc.xml Fri Mar 11 21:10:59 2011
@@ -0,0 +1,27 @@
+<assembly>
+ <id>coresrc</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>RELEASE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/src</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Modified: myfaces/core/branches/1.1.x/assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.1.x/assembly/src/main/resources/NOTICE.txt?rev=1080760&r1=1080759&r2=1080760&view=diff
==============================================================================
--- myfaces/core/branches/1.1.x/assembly/src/main/resources/NOTICE.txt (original)
+++ myfaces/core/branches/1.1.x/assembly/src/main/resources/NOTICE.txt Fri Mar 11 21:10:59 2011
@@ -1,6 +1,3 @@
-Apache MyFaces
-Copyright 2004-2007 The Apache Software Foundation
-
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/core/branches/1.1.x/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.1.x/impl/pom.xml?rev=1080760&r1=1080759&r2=1080760&view=diff
==============================================================================
--- myfaces/core/branches/1.1.x/impl/pom.xml (original)
+++ myfaces/core/branches/1.1.x/impl/pom.xml Fri Mar 11 21:10:59 2011
@@ -1,595 +1,582 @@
<?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.
+-->
<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">
- <parent>
+
+ <parent>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-core-project</artifactId>
+ <version>1.1.9-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-core-project</artifactId>
- <version>1.1.9-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <name>Apache MyFaces JSF-1.1 Implementation</name>
- <description>
- The private implementation classes of the Apache MyFaces Core JSF-1.1 Implementation.
- </description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/impl</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/impl</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/trunk/impl</url>
- </scm>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.vm</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/resources-facesconfig</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.3</version>
- <executions>
- <execution>
- <goals>
- <goal>build-metadata</goal>
- </goals>
- </execution>
- <execution>
- <id>maketags</id>
- <configuration>
- <packageContains>org.apache</packageContains>
- <typePrefix>javax.faces</typePrefix>
- <modelIds>
- <modelId>myfaces-api</modelId>
- </modelIds>
- </configuration>
- <goals>
- <goal>make-tags</goal>
- </goals>
- </execution>
- <execution>
- <id>makefacesconfig</id>
- <configuration>
- <xmlFile>org/apache/myfaces/resource/standard-faces-config.xml</xmlFile>
- <modelIds>
- <modelId>myfaces-api</modelId>
- <modelId>myfaces-impl</modelId>
- </modelIds>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- <execution>
- <id>makehtmltld</id>
- <configuration>
- <xmlFile>META-INF/myfaces_html.tld</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/myfaces_html-base.tld</xmlBaseFile>
- <templateFile>myfaces_html.vm</templateFile>
- <params>
- <shortname>h</shortname>
- <uri>http://java.sun.com/jsf/html</uri>
- <displayname>JSF HTML tag library.</displayname>
- <description>This tag library implements the standard JSF HTML tags.</description>
- </params>
- <modelIds>
- <modelId>myfaces-api</modelId>
- </modelIds>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- <execution>
- <id>makecoretld</id>
- <configuration>
- <xmlFile>META-INF/myfaces_core.tld</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/myfaces_core-base.tld</xmlBaseFile>
- <templateFile>myfaces_core.vm</templateFile>
- <modelIds>
- <modelId>myfaces-api</modelId>
- <modelId>myfaces-impl</modelId>
- </modelIds>
- <params>
- <shortname>f</shortname>
- <uri>http://java.sun.com/jsf/core</uri>
- <displayname>JSF core tag library.</displayname>
- <description>This tag library implements the standard JSF core tags.</description>
- </params>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/classes/META-INF</destDir>
- </configuration>
- </plugin>
- -->
- </plugins>
- </build>
- <profiles>
- <profile>
- <!-- This profile use a shared dependency rather than unpack the
- code directly. The ideal is that this profile is active when the
- version of this library is snapshot, but unfortunately there is
- no way to activate it (see http://jira.codehaus.org/browse/MNG-3826).
- Existing problems on maven 2.0.x architecture makes impossible do it.
- For now the solution is trigger it manually using the property
- -Ddev=true -->
- <id>add-shared-dependency</id>
- <activation>
- <property>
- <name>dev</name>
- <value>true</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>${myfaces-shared.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>unpack-shared</id>
- <activation>
- <property>
- <name>!dev</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--
- - The shared-impl project generates a modified version of the "shared" module
- - source and classes. The result is a jar full of files in the "shared_impl"
- - package that we can merge into the jar for this project.
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
- <version>1.0</version>
+ <artifactId>myfaces-impl</artifactId>
+ <name>Apache MyFaces JSF-1.1 Implementation</name>
+ <description>
+ The private implementation classes of the Apache MyFaces Core JSF-1.1 Implementation.
+ </description>
+ <url>http://myfaces.apache.org/core11/myfaces-impl</url>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/1.1.x/impl</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/1.1.x/impl</developerConnection>
+ <url>http://svn.apache.org/repos/asf/myfaces/core/branches/1.1.x/impl</url>
+ </scm>
+
+ <build>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>**/*.vm</exclude>
+ </excludes>
+ </resource>
+ <!--
+ <resource>
+ <directory>src/main/resources-facesconfig</directory>
+ </resource>
+ -->
+ </resources>
+
+ <plugins>
+
+ <!-- myfaces-build-plugin - we generate a lot of stuff with this plugin (see executions) -->
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
<executions>
- <execution>
- <id>unpack-shared-impl</id>
- <phase>process-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>${myfaces-shared.version}</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </configuration>
- </execution>
- <!-- unpack the shared sources into target/shared_sources-->
- <execution>
- <id>unpack-shared-impl-sources</id>
- <phase>process-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>${myfaces-shared.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/shared_sources</outputDirectory>
- </configuration>
- </execution>
+
+ <execution>
+ <id>makemyfacesmetadata</id>
+ <goals>
+ <goal>build-metadata</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>makefacesconfig</id>
+ <configuration>
+ <xmlFile>org/apache/myfaces/resource/standard-faces-config.xml</xmlFile>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ <modelId>myfaces-impl</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>make_tags</id>
+ <configuration>
+ <packageContains>org.apache</packageContains>
+ <typePrefix>javax.faces</typePrefix>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-tags</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>makecoretld</id>
+ <configuration>
+ <xmlFile>META-INF/myfaces_core.tld</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/myfaces_core-base.tld</xmlBaseFile>
+ <templateFile>myfaces_core.vm</templateFile>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ <modelId>myfaces-impl</modelId>
+ </modelIds>
+ <params>
+ <shortname>f</shortname>
+ <uri>http://java.sun.com/jsf/core</uri>
+ <displayname>JSF core tag library.</displayname>
+ <description>This tag library implements the standard JSF core tags.</description>
+ </params>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>makehtmltld</id>
+ <configuration>
+ <xmlFile>META-INF/myfaces_html.tld</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/myfaces_html-base.tld</xmlBaseFile>
+ <templateFile>myfaces_html.vm</templateFile>
+ <params>
+ <shortname>h</shortname>
+ <uri>http://java.sun.com/jsf/html</uri>
+ <displayname>JSF HTML tag library.</displayname>
+ <description>This tag library implements the standard JSF HTML tags.</description>
+ </params>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+
</executions>
- </plugin>
- <plugin>
- <!--
- - Add the unpacked shared 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.
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/shared_sources</source>
- </sources>
- </configuration>
- </execution>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+
+ <profiles>
+
+ <!--
+ This profile use a shared dependency rather than unpack the
+ code directly. The ideal is that this profile is active when the
+ version of this library is snapshot, but unfortunately there is
+ no way to activate it (see http://jira.codehaus.org/browse/MNG-3826).
+ Existing problems on maven 2.0.x architecture makes impossible do it.
+ For now the solution is trigger it manually using the property
+ -Ddev=true
+ -->
+ <profile>
+ <id>add-shared-dependency</id>
+ <activation>
+ <property>
+ <name>dev</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ <scope>compile</scope> <!-- otherwise it is scope=provided -->
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- standard unpacking of shared-impl -->
+ <profile>
+ <id>unpack-shared</id>
+ <activation>
+ <property>
+ <name>!dev</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!--
+ - The shared-impl project generates a modified version of the "shared" module
+ - source and classes. The result is a jar full of files in the "shared_impl"
+ - package that we can merge into the jar for this project.
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+
+ <execution>
+ <id>unpack-shared-impl</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ <version>${myfaces-shared.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>unpack-shared-impl-sources</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ <version>${myfaces-shared.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/shared_sources</outputDirectory>
+ </configuration>
+ </execution>
+
</executions>
</plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!--
- - Whenever the full website is generated, the command
- - mvn -Pgenerate-site site
- - should be used. This will create the "tlddoc" directory containing
- - nicely-formatted versions of the docs in the jsp taglib file, ie
- - docs on all the available tags and their properties.
+
+ <plugin>
+ <!--
+ Add the unpacked shared 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.
+ -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-source-shared</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/shared_sources</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ - Whenever the full website is generated, the command
+ - mvn -Pgenerate-site -Pgenerate-tlddoc site
+ - should be used. This will create the "tlddoc" directory containing
+ - nicely-formatted versions of the docs in the jsp taglib file, ie
+ - docs on all the available tags and their properties.
-->
- <id>generate-site</id>
- <build>
- <plugins>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>generate-tld-for-tlddoc</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <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>
- </execution>
- <execution>
- <id>generate-tld-for-jar</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/classes/META-INF</destDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
- <!--
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <executions>
- <execution>
- <goals>
- <goal>build-metadata</goal>
- </goals>
- </execution>
- <execution>
- <id>makehtmltld</id>
- <configuration>
- <xmlFile>classes/META-INF/myfaces_html.tld</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/myfaces_html-base.tld</xmlBaseFile>
- <templateFile>myfaces_html.vm</templateFile>
-
- <modelIds>
- <modelId>myfaces-api</modelId>
- </modelIds>
- </configuration>
- <goals>
- <goal>make-config</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/classes/META-INF</taglib.src.dir>
- <tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
+ <profile>
+ <id>generate-site</id>
+ <build>
+ <plugins>
+
+ <!-- Generate content for custom tagdoc report -->
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <executions>
+
+ <execution>
+ <id>site-tagdoc-content</id>
+ <configuration>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ <modelId>myfaces-impl</modelId>
+ </modelIds>
+ <taglibs>
+ <f>http://java.sun.com/jsf/core</f>
+ <h>http://java.sun.com/jsf/html</h>
+ </taglibs>
+ </configuration>
+ <goals>
+ <goal>tagdoc-content</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>site-web-config</id>
+ <configuration>
+ <templateFile>xdoc-web-config.vm</templateFile>
+ <outputDirectory>${project.build.directory}/generated-site/xdoc</outputDirectory>
+ <xmlFile>webconfig.xml</xmlFile>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ <modelId>myfaces-impl</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <taglib.src.dir>${basedir}/target/classes/META-INF</taglib.src.dir>
+ <tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
+ </configuration>
+ </plugin>
- <profile>
- <!--
- - Whenever files are deployed to a snapshot or release repository,
- - mvn -Pgenerate-assembly deploy
- - should be used. This will create additional artifacts that are
- - useful but too time-consuming to create when just doing a local
- - "mvn install" operation.
+ <!-- trigger tagdoc-index report -->
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <configuration>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ <modelId>myfaces-impl</modelId>
+ </modelIds>
+ <taglibs>
+ <f>http://java.sun.com/jsf/core</f>
+ <h>http://java.sun.com/jsf/html</h>
+ </taglibs>
+ </configuration>
+ <reports>
+ <report>tagdoc-index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
+ <!--
+ - Whenever files are deployed to a snapshot or release repository,
+ - mvn -Pgenerate-assembly deploy
+ - should be used. This will create additional artifacts that are
+ - useful but too time-consuming to create when just doing a local
+ - "mvn install" operation.
-->
- <id>generate-assembly</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
+ <profile>
+ <id>generate-assembly</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3</version>
+ <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>
+ <version>2.4</version>
+ <executions>
+
+ <execution>
+ <id>attach-tlddoc</id>
+ <goals>
+ <goal>taglibdocjar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <taglib.src.dir>${basedir}/target/classes/META-INF</taglib.src.dir>
+ <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- check Java 1.4 -->
+ <profile>
+ <id>checkJDK</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jvnet</groupId>
+ <artifactId>animal-sniffer</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <signature>
+ <groupId>org.jvnet.animal-sniffer</groupId>
+ <artifactId>java1.4</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- TODO jakobk: update to codehaus animal-sniffer (is in maven-central)! -->
+ <!-- plugin is only in java.net -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>java.net.repo</id>
+ <name>java.net repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ </profiles>
+
+
+ <dependencies>
+ <!-- NOTE that all versions and scopes are defined in the parent dependencyManagement section -->
+
+ <!-- myfaces-api -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+
+ <!-- this dependency will be packed together with the main artifact of this pom -->
+ <dependency>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ </dependency>
+
+ <!-- Servlet 2.3 -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <!-- JSP 2.0 -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <!-- version defined in parent -->
+ <scope>provided</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ </dependency>
+
+ <!-- TEST DEPENDENCIES -->
+
+ <dependency>
+ <groupId>org.apache.struts.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus</artifactId>
+ </dependency>
+
+ </dependencies>
+
+
+ <reporting>
<plugins>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>generate-tld-for-tlddoc</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <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>
- </execution>
- <execution>
- <id>generate-tld-for-jar</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/classes/META-INF</destDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
- <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>
- <version>2.3.1</version>
- <executions>
- <execution>
- <id>attach-tlddoc</id>
- <goals>
- <goal>taglibdocjar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <taglib.src.dir>${basedir}/target/classes/META-INF</taglib.src.dir>
- <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
- </configuration>
- </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>2.2</version>
+ <reportSets>
+ <reportSet>
+ <id>dual-report</id>
+ <configuration>
+ <type>range</type>
+ <range>30</range>
+ </configuration>
+ <reports>
+ <report>changelog</report>
+ <report>file-activity</report>
+ <report>dev-activity</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
</plugins>
- </build>
- </profile>
- <profile>
- <id>checkJDK</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet</groupId>
- <artifactId>animal-sniffer</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <signature>
- <groupId>org.jvnet.animal-sniffer</groupId>
- <artifactId>java1.4</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <pluginRepositories>
- <pluginRepository>
- <id>java.net.repo</id>
- <name>java.net repository</name>
- <url>http://download.java.net/maven/2</url>
- </pluginRepository>
- </pluginRepositories>
- <repositories>
- <repository>
- <id>java.net.repo</id>
- <name>java.net repository</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- </repositories>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.struts.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <version>13-1.7.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>${myfaces-shared.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <reportSets>
- <reportSet>
- <id>dual-report</id>
- <configuration>
- <type>range</type>
- <range>30</range>
- </configuration>
- <reports>
- <report>changelog</report>
- <report>file-activity</report>
- <report>dev-activity</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- </plugins>
- </reporting>
-
- <properties>
- <myfaces-shared.version>2.0.12-SNAPSHOT</myfaces-shared.version>
- </properties>
+ </reporting>
</project>