You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/03/31 00:31:28 UTC
svn commit: r642831 - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry/services/
tapestry-ioc/src/images/
tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/
tapestry-ioc/src/site/resources/images/ tapestry-upload/...
Author: hlship
Date: Sun Mar 30 15:31:24 2008
New Revision: 642831
URL: http://svn.apache.org/viewvc?rev=642831&view=rev
Log:
Update the TypeCoercer image, and make a couple of minor style changes to some code.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/images/type-coercer.graffle
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java
tapestry/tapestry5/trunk/tapestry-ioc/src/site/resources/images/type-coercer.png
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java?rev=642831&r1=642830&r2=642831&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java Sun Mar 30 15:31:24 2008
@@ -154,15 +154,9 @@
*/
public static void contributeBindingSource(MappedConfiguration<String, BindingFactory> configuration,
- AssetSource assetSource,
-
@InjectService("PropBindingFactory")
BindingFactory propBindingFactory,
- FieldValidatorSource fieldValidatorSource,
-
- TranslatorSource translatorSource,
-
ObjectLocator locator)
{
configuration.add(TapestryConstants.LITERAL_BINDING_PREFIX, new LiteralBindingFactory());
@@ -170,8 +164,8 @@
configuration.add("component", new ComponentBindingFactory());
configuration.add("message", new MessageBindingFactory());
- configuration.add("validate", new ValidateBindingFactory(fieldValidatorSource));
- configuration.add("translate", new TranslateBindingFactory(translatorSource));
+ configuration.add("validate", locator.autobuild(ValidateBindingFactory.class));
+ configuration.add("translate", locator.autobuild(TranslateBindingFactory.class));
configuration.add("block", new BlockBindingFactory());
configuration.add("asset", locator.autobuild(AssetBindingFactory.class));
configuration.add("var", new RenderVariableBindingFactory());
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/images/type-coercer.graffle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/images/type-coercer.graffle?rev=642831&r1=642830&r2=642831&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/images/type-coercer.graffle (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/images/type-coercer.graffle Sun Mar 30 15:31:24 2008
@@ -88,7 +88,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -113,6 +113,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -185,7 +190,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -247,7 +252,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -321,7 +326,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -383,7 +388,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -445,7 +450,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -470,6 +475,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -542,7 +552,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -567,6 +577,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -602,6 +617,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -674,7 +694,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -750,7 +770,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -813,7 +833,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -875,7 +895,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -937,7 +957,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -999,7 +1019,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -1073,7 +1093,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -1135,7 +1155,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -1209,7 +1229,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -1285,7 +1305,7 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf949
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
@@ -1313,6 +1333,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1348,6 +1373,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1383,6 +1413,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1418,6 +1453,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1453,6 +1493,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1488,6 +1533,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1523,6 +1573,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1558,6 +1613,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1593,6 +1653,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1629,6 +1694,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1664,6 +1734,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1700,6 +1775,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1735,6 +1815,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1770,6 +1855,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1805,6 +1895,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1840,6 +1935,11 @@
</array>
<key>Style</key>
<dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>YES</string>
+ </dict>
<key>stroke</key>
<dict>
<key>HeadArrow</key>
@@ -1958,7 +2058,7 @@
</dict>
</array>
<key>ModificationDate</key>
- <string>2008-02-06 10:47:28 -0800</string>
+ <string>2008-03-27 17:18:27 -0700</string>
<key>Modifier</key>
<string>Howard Lewis Ship</string>
<key>NotesVisible</key>
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java?rev=642831&r1=642830&r2=642831&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java Sun Mar 30 15:31:24 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -17,16 +17,14 @@
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
/**
- * An immutable object that represents a mapping from one type to another. This is also the
- * contribution type when building the {@link org.apache.tapestry.ioc.services.TypeCoercer} service.
- * Wraps a {@link org.apache.tapestry.ioc.services.Coercion} object that
- * performs the work with additional properties that describe the input and output types of the
- * coercion, needed when searching for an appropriate coercion (or sequence of coercions).
+ * An immutable object that represents a mapping from one type to another. This is also the contribution type when
+ * building the {@link org.apache.tapestry.ioc.services.TypeCoercer} service. Wraps a {@link
+ * org.apache.tapestry.ioc.services.Coercion} object that performs the work with additional properties that describe
+ * the input and output types of the coercion, needed when searching for an appropriate coercion (or sequence of
+ * coercions).
*
- * @param <S>
- * source (input) type
- * @param <T>
- * target (output) type
+ * @param <S> source (input) type
+ * @param <T> target (output) type
*/
public final class CoercionTuple<S, T>
{
@@ -37,8 +35,7 @@
private final Coercion<S, T> _coercion;
/**
- * Wraps an arbitrary coercion with an implementation of toString() that identifies the source
- * and target types.
+ * Wraps an arbitrary coercion with an implementation of toString() that identifies the source and target types.
*/
private class CoercionWrapper<WS, WT> implements Coercion<WS, WT>
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/resources/images/type-coercer.png
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/resources/images/type-coercer.png?rev=642831&r1=642830&r2=642831&view=diff
==============================================================================
Binary files - no diff available.
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java?rev=642831&r1=642830&r2=642831&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java Sun Mar 30 15:31:24 2008
@@ -38,9 +38,10 @@
public boolean service(HttpServletRequest request, HttpServletResponse response, HttpServletRequestHandler handler)
throws IOException
{
- if (ServletFileUpload.isMultipartContent(request)) request = _decoder.decode(request);
+ HttpServletRequest newRequest = ServletFileUpload.isMultipartContent(request) ? _decoder.decode(
+ request) : request;
- return handler.service(request, response);
+ return handler.service(newRequest, response);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java?rev=642831&r1=642830&r2=642831&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java Sun Mar 30 15:31:24 2008
@@ -40,11 +40,11 @@
}
@Scope(IOCConstants.PERTHREAD_SCOPE)
- public synchronized static MultipartDecoder buildMultipartDecoder(PerthreadManager perthreadManager,
+ public static MultipartDecoder buildMultipartDecoder(PerthreadManager perthreadManager,
- RegistryShutdownHub shutdownHub,
+ RegistryShutdownHub shutdownHub,
- ObjectLocator locator)
+ ObjectLocator locator)
{
MultipartDecoderImpl multipartDecoder = locator.autobuild(MultipartDecoderImpl.class);