You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2006/05/15 21:19:51 UTC
svn commit: r406720 - in /myfaces/core/trunk: api/pom.xml assembly/pom.xml
impl/pom.xml
impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
pom.xml
Author: schof
Date: Mon May 15 12:19:50 2006
New Revision: 406720
URL: http://svn.apache.org/viewcvs?rev=406720&view=rev
Log:
merge with 1_1_3 branch (r396044 - r406690)
Modified:
myfaces/core/trunk/api/pom.xml
myfaces/core/trunk/assembly/pom.xml
myfaces/core/trunk/impl/pom.xml
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
myfaces/core/trunk/pom.xml
Modified: myfaces/core/trunk/api/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/pom.xml?rev=406720&r1=406719&r2=406720&view=diff
==============================================================================
--- myfaces/core/trunk/api/pom.xml (original)
+++ myfaces/core/trunk/api/pom.xml Mon May 15 12:19:50 2006
@@ -1,65 +1,117 @@
-<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"?><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>
+ <groupId>org.apache.myfaces.core</groupId>
+ <version>1.1.4-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
-
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <packaging>jar</packaging>
<name>API</name>
<description>
The MyFaces API Subproject provides a full set of the API interfaces and classes
defined in JSR-127 (see also http://www.jcp.org/en/jsr/detail?id=127).
</description>
-
- <parent>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-core-project</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </parent>
-
<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>
-
+ <profiles>
+ <profile>
+ <id>generate-assembly</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <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"></property>
+ <ant inheritRefs="true" inheritAll="true" antfile="build.xml" dir="${project.basedir}">
+ <target name="generate-components"></target>
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<dependencies>
-
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
<scope>compile</scope>
</dependency>
-
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.6</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
<scope>compile</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>
@@ -67,60 +119,48 @@
<scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
+ <groupId>javax.servlet</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>test</scope>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.6</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
-
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.struts.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
-
<reporting>
-
<plugins>
-
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.0-beta-3</version>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>changelog-maven-plugin</artifactId>
@@ -140,18 +180,14 @@
</reportSet>
</reportSets>
</plugin>
-
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.0-beta-3</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId>
</plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
+ <artifactId>surefire-report-maven-plugin</artifactId>
</plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
@@ -160,90 +196,6 @@
<tags>TODO, FIXME, XXX, @deprecated</tags>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
-
</plugins>
-
</reporting>
-
- <profiles>
- <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>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals><goal>jar</goal></goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <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>
- <configuration>
- <tasks>
- <property name="src.dir" value="${project.basedir}/src/main/java"/>
- <ant dir="${project.basedir}" antfile="build.xml"
- inheritRefs="true" inheritAll="true">
- <target name="generate-components"/>
- </ant>
- </tasks>
- </configuration>
- <goals><goal>run</goal></goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.maven</groupId>
- <artifactId>build-tools</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
-
-</project>
+</project>
\ No newline at end of file
Modified: myfaces/core/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/assembly/pom.xml?rev=406720&r1=406719&r2=406720&view=diff
==============================================================================
--- myfaces/core/trunk/assembly/pom.xml (original)
+++ myfaces/core/trunk/assembly/pom.xml Mon May 15 12:19:50 2006
@@ -138,6 +138,13 @@
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+
</dependencies>
</project>
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/impl/pom.xml?rev=406720&r1=406719&r2=406720&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Mon May 15 12:19:50 2006
@@ -1,111 +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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <packaging>jar</packaging>
- <name>Impl</name>
- <url>http://myfaces.apache.org</url>
- <description>
- This is the MyFaces Impl Subproject Description [INSERT MORE STUFF HERE]
- </description>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
<version>1.1.4-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <name>Impl</name>
+ <description>This is the MyFaces Impl Subproject Description [INSERT MORE STUFF HERE]</description>
+ <url>http://myfaces.apache.org</url>
<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>
-
- <dependencies>
-
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
- <scope>provided</scope> <!-- because we add all classes to the jar directly -->
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <version>13-1.7.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
<build>
-
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -114,18 +25,11 @@
<directory>src/main/resources-facesconfig</directory>
</resource>
</resources>
-
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xslt-maven-plugin</artifactId>
<version>1.0</version>
- <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>
<executions>
<execution>
<goals>
@@ -133,8 +37,13 @@
</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>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
@@ -142,78 +51,24 @@
<execution>
<id>unpack-shared-impl</id>
<phase>process-classes</phase>
- <goals><goal>unpack</goal></goals>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ <version>2.0.2-SNAPSHOT</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
-
</plugins>
-
</build>
-
- <reporting>
-
- <plugins>
-
- <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.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.0-beta-3</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <configuration>
- <tags>TODO, FIXME, XXX, @deprecated</tags>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
-
- </plugins>
-
- </reporting>
-
<profiles>
<profile>
<id>generate-site</id>
@@ -251,7 +106,6 @@
</executions>
</plugin>
</plugins>
-
</build>
<reporting>
<plugins>
@@ -302,36 +156,40 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadoc</id>
- <goals><goal>jar</goal></goals>
+ <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/tlddoc-site</taglib.src.dir>
- <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
- </configuration>
<executions>
<execution>
<id>attach-tlddoc</id>
- <goals><goal>taglibdocjar</goal></goals>
+ <goals>
+ <goal>taglibdocjar</goal>
+ </goals>
</execution>
</executions>
+ <configuration>
+ <taglib.src.dir>${basedir}/target/tlddoc-site</taglib.src.dir>
+ <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-source</id>
- <goals><goal>jar</goal></goals>
+ <goals>
+ <goal>jar</goal>
+ </goals>
</execution>
</executions>
</plugin>
@@ -339,5 +197,115 @@
</build>
</profile>
</profiles>
-
-</project>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.1</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-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.0.4</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>2.0.2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</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.0-beta-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>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>surefire-report-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ <configuration>
+ <tags>TODO, FIXME, XXX, @deprecated</tags>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
\ No newline at end of file
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=406720&r1=406719&r2=406720&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java Mon May 15 12:19:50 2006
@@ -407,7 +407,7 @@
}
intBuf.append("]");
- buf.insert(0,intBuf);
+ buf.insert(0,intBuf.toString());
if(component!=null)
{
Modified: myfaces/core/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/pom.xml?rev=406720&r1=406719&r2=406720&view=diff
==============================================================================
--- myfaces/core/trunk/pom.xml (original)
+++ myfaces/core/trunk/pom.xml Mon May 15 12:19:50 2006
@@ -26,14 +26,24 @@
</modules>
<repositories>
<repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
<id>apache-maven-snapshots</id>
<url>http://cvs.apache.org/maven-snapshot-repository</url>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>myfaces-repo</id>
+ <url>http://myfaces.zones.apache.org/dist/maven-repository</url>
</repository>
</repositories>
</project>