You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/13 20:08:18 UTC
svn commit: r486802 - in /tapestry/tapestry4/trunk: ./ tapestry-annotations/
tapestry-annotations/src/java/org/apache/tapestry/form/
tapestry-annotations/src/test/org/apache/tapestry/form/ tapestry-examples/
tapestry-framework/src/java/org/apache/tapes...
Author: jkuhnert
Date: Wed Dec 13 11:08:16 2006
New Revision: 486802
URL: http://svn.apache.org/viewvc?view=rev&rev=486802
Log:
Fixes TAPESTRY-1187.
Core framework now works under 1.4 jre. :)
Added:
tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/form/
tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/form/EnumPropertySelectionModel.java
- copied unchanged from r486778, tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/EnumPropertySelectionModel.java
tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/form/package.html (with props)
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/form/
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/form/TestEnumPropertySelectionModel.java
- copied unchanged from r486778, tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestEnumPropertySelectionModel.java
Removed:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/EnumPropertySelectionModel.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestEnumPropertySelectionModel.java
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/tapestry-annotations/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/CachedAsset.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/internal/event/EventBoundListener.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/DefaultAttribute.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/FieldLabel.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Wed Dec 13 11:08:16 2006
@@ -273,9 +273,22 @@
<version>2.1-SNAPSHOT</version>
<inherited>true</inherited>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.4</source>
+ <target>1.4</target>
</configuration>
+ <executions>
+ <execution>
+ <id>compile-tests</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: tapestry/tapestry4/trunk/tapestry-annotations/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/pom.xml?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/pom.xml Wed Dec 13 11:08:16 2006
@@ -110,6 +110,16 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
Added: tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/form/package.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/form/package.html?view=auto&rev=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/form/package.html (added)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/form/package.html Wed Dec 13 11:08:16 2006
@@ -0,0 +1,13 @@
+<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>Tapestry: Web Application Framework</title>
+</head>
+<body>
+
+<p>
+Contains all form related classes that depend on a jre >= 1.5.
+</p>
+
+</body>
+</html>
Propchange: tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/form/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry4/trunk/tapestry-examples/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/pom.xml?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/pom.xml Wed Dec 13 11:08:16 2006
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.tapestry</groupId>
@@ -14,14 +13,14 @@
</parent>
<name>Examples</name>
<inceptionYear>2006</inceptionYear>
-
+
<modules>
<module>Vlib</module>
<module>VlibBeans</module>
<module>TimeTracker</module>
<module>Workbench</module>
</modules>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -41,7 +40,24 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<reporting>
<outputDirectory>../target/site/tapestry-examples</outputDirectory>
</reporting>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java Wed Dec 13 11:08:16 2006
@@ -895,7 +895,6 @@
/**
* {@inheritDoc}
*/
- @Override
public int hashCode()
{
final int prime = 31;
@@ -908,7 +907,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean equals(Object obj)
{
if (this == obj) return true;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/CachedAsset.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/CachedAsset.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/CachedAsset.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/CachedAsset.java Wed Dec 13 11:08:16 2006
@@ -130,7 +130,6 @@
/**
* {@inheritDoc}
*/
- @Override
public int hashCode()
{
final int prime = 31;
@@ -142,7 +141,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean equals(Object obj)
{
if (this == obj) return true;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java Wed Dec 13 11:08:16 2006
@@ -492,7 +492,7 @@
if (LOG.isDebugEnabled())
LOG.debug("Redirecting to: " + location);
-
+
_infrastructure.getRequest().forward(location);
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java Wed Dec 13 11:08:16 2006
@@ -88,7 +88,7 @@
NumberTranslator translator = (NumberTranslator)super.getFieldTranslator(field, NumberTranslator.class);
if (translator != null)
- maxString = translator.format(field, context.getLocale(), _max);
+ maxString = translator.format(field, context.getLocale(), new Double(_max));
else
maxString = String.valueOf(_max);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java Wed Dec 13 11:08:16 2006
@@ -70,7 +70,7 @@
{ field.getDisplayName(),
(translator != null) ?
translator.format(field, messages.getLocale(), _maxDate)
- : _maxDate});
+ : _maxDate.toString()});
}
public void renderContribution(IMarkupWriter writer, IRequestCycle cycle,
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java Wed Dec 13 11:08:16 2006
@@ -88,7 +88,7 @@
NumberTranslator translator = (NumberTranslator)super.getFieldTranslator(field, NumberTranslator.class);
if (translator != null)
- minString = translator.format(field, context.getLocale(), _min);
+ minString = translator.format(field, context.getLocale(), new Double(_min));
else
minString = String.valueOf(_min);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java Wed Dec 13 11:08:16 2006
@@ -73,7 +73,7 @@
ValidationStrings.DATE_TOO_EARLY,
new Object[] { field.getDisplayName(),
(translator != null) ?
- translator.format(field, messages.getLocale(), _minDate) : _minDate});
+ translator.format(field, messages.getLocale(), _minDate) : _minDate.toString()});
}
public void renderContribution(IMarkupWriter writer, IRequestCycle cycle,
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/internal/event/EventBoundListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/internal/event/EventBoundListener.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/internal/event/EventBoundListener.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/internal/event/EventBoundListener.java Wed Dec 13 11:08:16 2006
@@ -147,7 +147,6 @@
/**
* {@inheritDoc}
*/
- @Override
public int hashCode()
{
final int prime = 31;
@@ -161,7 +160,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean equals(Object obj)
{
if (this == obj) return true;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/DefaultAttribute.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/DefaultAttribute.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/DefaultAttribute.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/DefaultAttribute.java Wed Dec 13 11:08:16 2006
@@ -32,7 +32,7 @@
_raw = raw;
}
- public String getValue()
+ public Object getValue()
{
return _value;
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java Wed Dec 13 11:08:16 2006
@@ -116,7 +116,7 @@
*/
public boolean isDynamic()
{
- return Boolean.FALSE;
+ return false;
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java Wed Dec 13 11:08:16 2006
@@ -158,7 +158,7 @@
*/
public boolean isDynamic()
{
- return Boolean.TRUE;
+ return true;
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java Wed Dec 13 11:08:16 2006
@@ -111,7 +111,7 @@
*/
public boolean isDynamic()
{
- return Boolean.TRUE;
+ return true;
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java Wed Dec 13 11:08:16 2006
@@ -826,7 +826,6 @@
/**
* {@inheritDoc}
*/
- @Override
public int hashCode()
{
final int prime = 31;
@@ -841,7 +840,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean equals(Object obj)
{
if (this == obj) return true;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/FieldLabel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/FieldLabel.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/FieldLabel.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/FieldLabel.java Wed Dec 13 11:08:16 2006
@@ -73,7 +73,7 @@
IValidationDelegate delegate = form.getDelegate();
- String id = field == null ? null : field.getClientId();
+ String id = (field == null) ? null : field.getClientId();
if (field != null)
delegate.writeLabelPrefix(field, writer, cycle);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java Wed Dec 13 11:08:16 2006
@@ -76,7 +76,7 @@
null,
ValidationStrings.DATE_TOO_LATE,
new Object[]
- { "Fred", today },
+ { "Fred", today.toString() },
"default message");
replay();
@@ -110,7 +110,7 @@
"custom",
ValidationStrings.DATE_TOO_LATE,
new Object[]
- { "Fred", today },
+ { "Fred", today.toString() },
"custom message");
replay();
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java Wed Dec 13 11:08:16 2006
@@ -124,9 +124,9 @@
verify();
assertEquals(json.toString(),
- "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange,"
- + "{min:20.0,decimal:\",\",separator:\" \"}]]},"
- + "\"myfield\":{\"constraints\":[\"default message\"]}}");
+ "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange," +
+ "{min:20.0,decimal:\",\",separator:\"Â \"}]]}," +
+ "\"myfield\":{\"constraints\":[\"default message\"]}}");
}
public void test_Render_Contribution_Custom_Message()
@@ -161,9 +161,9 @@
verify();
assertEquals(json.toString(),
- "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange,"
- + "{min:20.0,decimal:\",\",separator:\" \"}]]},"
- + "\"myfield\":{\"constraints\":[\"custom\\\\message\"]}}");
+ "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange," +
+ "{min:20.0,decimal:\",\",separator:\"Â \"}]]},\"myfield\":" +
+ "{\"constraints\":[\"custom\\\\message\"]}}");
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java?view=diff&rev=486802&r1=486801&r2=486802
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java Wed Dec 13 11:08:16 2006
@@ -76,7 +76,7 @@
null,
ValidationStrings.DATE_TOO_EARLY,
new Object[]
- { "Fred", tomorrow },
+ { "Fred", tomorrow.toString() },
"default message");
replay();
@@ -110,7 +110,7 @@
"custom",
ValidationStrings.DATE_TOO_EARLY,
new Object[]
- { "Fred", tomorrow },
+ { "Fred", tomorrow.toString() },
"custom message");
replay();
Re: svn commit: r486802 - in /tapestry/tapestry4/trunk: ./ tapestry-annotations/
tapestry-annotations/src/java/org/apache/tapestry/form/ tapestry-annotations/src/test/org/apache/tapestry/form/
tapestry-examples/ tapestry-framework/src/java/org/apache/tapes...
Posted by andyhot <an...@di.uoa.gr>.
Jesse, is that separator character (in the json) supposed to be there?
It causes my tests to fail... I had removed it previously, but you
recommitted it!
jkuhnert@apache.org wrote:
> Author: jkuhnert
> Date: Wed Dec 13 11:08:16 2006
> New Revision: 486802
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=486802
> Log:
> Fixes TAPESTRY-1187.
>
> Core framework now works under 1.4 jre. :)
>
>
> Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
> URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java?view=diff&rev=486802&r1=486801&r2=486802
> ==============================================================================
> --- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java (original)
> +++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java Wed Dec 13 11:08:16 2006
> @@ -124,9 +124,9 @@
> verify();
>
> assertEquals(json.toString(),
> - "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange,"
> - + "{min:20.0,decimal:\",\",separator:\" \"}]]},"
> - + "\"myfield\":{\"constraints\":[\"default message\"]}}");
> + "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange," +
> + "{min:20.0,decimal:\",\",separator:\"Â \"}]]}," +
> + "\"myfield\":{\"constraints\":[\"default message\"]}}");
> }
>
> public void test_Render_Contribution_Custom_Message()
> @@ -161,9 +161,9 @@
> verify();
>
> assertEquals(json.toString(),
> - "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange,"
> - + "{min:20.0,decimal:\",\",separator:\" \"}]]},"
> - + "\"myfield\":{\"constraints\":[\"custom\\\\message\"]}}");
> + "{\"constraints\":{\"myfield\":[[dojo.validate.isInRange," +
> + "{min:20.0,decimal:\",\",separator:\"Â \"}]]},\"myfield\":" +
> + "{\"constraints\":[\"custom\\\\message\"]}}");
> }
>
> }
>
--
Andreas Andreou - andyhot@apache.org - http://andyhot.di.uoa.gr
Tapestry / Tacos developer
Open Source / J2EE Consulting
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org