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/04/17 17:24:17 UTC
svn commit: r394697 - in /myfaces/core/trunk: ./
api/src/main/java/javax/faces/component/ assembly/src/main/assembly/ impl/
impl/src/test/java/org/apache/myfaces/application/
impl/src/test/java/org/apache/myfaces/application/jsp/
Author: schof
Date: Mon Apr 17 08:24:14 2006
New Revision: 394697
URL: http://svn.apache.org/viewcvs?rev=394697&view=rev
Log:
results of 1.1.2 branch merge
Added:
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/
- copied from r394531, myfaces/core/branches/1_1_2/impl/src/test/java/org/apache/myfaces/application/
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/jsp/
- copied from r394531, myfaces/core/branches/1_1_2/impl/src/test/java/org/apache/myfaces/application/jsp/
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
- copied unchanged from r394531, myfaces/core/branches/1_1_2/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentChildrenList.java
myfaces/core/trunk/assembly/src/main/assembly/dep.xml
myfaces/core/trunk/impl/pom.xml
myfaces/core/trunk/pom.xml
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java?rev=394697&r1=394696&r2=394697&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java Mon Apr 17 08:24:14 2006
@@ -282,6 +282,8 @@
{
_MessageUtils.addErrorMessage(context, this, ee);
}
+
+ setValid(false);
}
catch (RuntimeException e)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java?rev=394697&r1=394696&r2=394697&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java Mon Apr 17 08:24:14 2006
@@ -298,7 +298,7 @@
*/
public Object put(Object key, Object value)
{
- checkKeyAndValue(key);
+ checkKeyAndValue(key, value);
PropertyDescriptor propertyDescriptor = getPropertyDescriptor((String)key);
if (propertyDescriptor != null)
@@ -420,12 +420,12 @@
}
- private void checkKeyAndValue(Object key)
+ private void checkKeyAndValue(Object key, Object value)
{
//http://issues.apache.org/jira/browse/MYFACES-458: obviously, the spec is a little unclear here,
// but value == null should be allowed - if there is a TCK-test failing due to this, we should
// apply for getting the TCK-test dropped
- // if (value == null) throw new NullPointerException("value");
+ if (value == null) throw new NullPointerException("value");
checkKey(key);
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentChildrenList.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentChildrenList.java?rev=394697&r1=394696&r2=394697&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentChildrenList.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentChildrenList.java Mon Apr 17 08:24:14 2006
@@ -50,20 +50,6 @@
public Object set(int index, Object value)
{
checkValue(value);
-
- UIComponent newChild = (UIComponent) value;
-
- for (int i = 0; i < _list.size(); i++)
- {
- UIComponent component = (UIComponent) _list.get(i);
- if(component.getId()!=null && component.getId().equals(newChild.getId()))
- {
- if(i!=index)
- throw new IllegalStateException(
- "Duplicate id : "+newChild.getId()+". Child could not be added.");
- }
- }
-
setNewParent((UIComponent)value);
UIComponent child = (UIComponent) _list.set(index, value);
if (child != null) child.setParent(null);
@@ -73,7 +59,6 @@
public boolean add(Object value)
{
checkValue(value);
- checkAddAllowed((UIComponent) value);
setNewParent((UIComponent)value);
return _list.add(value);
}
@@ -81,21 +66,10 @@
public void add(int index, Object value)
{
checkValue(value);
- checkAddAllowed((UIComponent) value);
setNewParent((UIComponent)value);
_list.add(index, value);
}
- private void checkAddAllowed(UIComponent newChild)
- {
- for (int i = 0; i < _list.size(); i++)
- {
- UIComponent component = (UIComponent) _list.get(i);
- if(component.getId()!=null && component.getId().equals(newChild.getId()))
- throw new IllegalStateException("Duplicate id : "+newChild.getId()+". Child could not be added.");
- }
- }
-
public Object remove(int index)
{
UIComponent child = (UIComponent) _list.remove(index);
@@ -119,7 +93,5 @@
if (value == null) throw new NullPointerException("value");
if (!(value instanceof UIComponent)) throw new ClassCastException("value is not a UIComponent");
}
-
-
}
Modified: myfaces/core/trunk/assembly/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/assembly/src/main/assembly/dep.xml?rev=394697&r1=394696&r2=394697&view=diff
==============================================================================
--- myfaces/core/trunk/assembly/src/main/assembly/dep.xml (original)
+++ myfaces/core/trunk/assembly/src/main/assembly/dep.xml Mon Apr 17 08:24:14 2006
@@ -18,6 +18,7 @@
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
+ <include>RELEASE*</include>
</includes>
</fileSet>
<fileSet>
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/impl/pom.xml?rev=394697&r1=394696&r2=394697&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Mon Apr 17 08:24:14 2006
@@ -26,10 +26,10 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
+ <groupId>myfaces</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
+ <version>1.1.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: myfaces/core/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/pom.xml?rev=394697&r1=394696&r2=394697&view=diff
==============================================================================
--- myfaces/core/trunk/pom.xml (original)
+++ myfaces/core/trunk/pom.xml Mon Apr 17 08:24:14 2006
@@ -1,27 +1,29 @@
-<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>
- <groupId>org.apache.myfaces.maven</groupId>
<artifactId>myfaces-master</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
<packaging>pom</packaging>
- <version>1.1.3-SNAPSHOT</version>
<name>Core Project</name>
+ <version>1.1.3-SNAPSHOT</version>
<url>http://myfaces.apache.org/projects</url>
-
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10600</url>
+ </issueManagement>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/myfaces/core/trunk</url>
</scm>
-
+ <modules>
+ <module>api</module>
+ <module>impl</module>
+ </modules>
<repositories>
<repository>
<snapshots />
@@ -29,29 +31,4 @@
<url>http://cvs.apache.org/maven-snapshot-repository</url>
</repository>
</repositories>
-
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10600</url>
- </issueManagement>
-
- <modules>
- <module>api</module>
- <module>impl</module>
- </modules>
-
-
- <build>
- <pluginManagement>
- <plugins>
- <!-- this version has already the sources classifier feature -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <version>2.0-beta-2-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-</project>
+</project>
\ No newline at end of file