You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by dr...@apache.org on 2011/09/18 11:28:11 UTC
svn commit: r1172235 - in /tapestry/tapestry5/trunk/tapestry-kaptcha/src:
main/java/org/apache/tapestry5/kaptcha/components/
main/java/org/apache/tapestry5/kaptcha/services/
main/resources/org/apache/tapestry5/kaptcha/
main/resources/org/apache/tapestr...
Author: drobiazko
Date: Sun Sep 18 09:28:10 2011
New Revision: 1172235
URL: http://svn.apache.org/viewvc?rev=1172235&view=rev
Log:
TAP5-1586: kaptcha.css is only included when KaptchaField is used.
Added:
tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/resources/org/apache/tapestry5/kaptcha/components/
tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/resources/org/apache/tapestry5/kaptcha/components/kaptcha.css (contents, props changed)
- copied, changed from r1172225, tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/resources/org/apache/tapestry5/kaptcha/kaptcha.css
Removed:
tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/resources/org/apache/tapestry5/kaptcha/kaptcha.css
Modified:
tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java
tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/services/KaptchaModule.java
tapestry/tapestry5/trunk/tapestry-kaptcha/src/test/resources/kaptcha/demo/pages/Index.tml
Modified: tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java?rev=1172235&r1=1172234&r2=1172235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java Sun Sep 18 09:28:10 2011
@@ -21,6 +21,7 @@ import org.apache.tapestry5.MarkupWriter
import org.apache.tapestry5.ValidationTracker;
import org.apache.tapestry5.annotations.BeginRender;
import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Import;
import org.apache.tapestry5.annotations.Parameter;
import org.apache.tapestry5.annotations.SupportsInformalParameters;
import org.apache.tapestry5.corelib.base.AbstractField;
@@ -37,6 +38,7 @@ import org.apache.tapestry5.services.Req
* @since 5.3
*/
@SupportsInformalParameters
+@Import(stylesheet = "kaptcha.css")
public class KaptchaField extends AbstractField
{
@@ -86,13 +88,13 @@ public class KaptchaField extends Abstra
writer.element("input",
- "type", "password",
+ "type", "password",
- "id", getClientId(),
+ "id", getClientId(),
- "name", getControlName(),
+ "name", getControlName(),
- "value", "");
+ "value", "");
resources.renderInformalParameters(writer);
Modified: tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/services/KaptchaModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/services/KaptchaModule.java?rev=1172235&r1=1172234&r2=1172235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/services/KaptchaModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/services/KaptchaModule.java Sun Sep 18 09:28:10 2011
@@ -14,8 +14,6 @@
package org.apache.tapestry5.kaptcha.services;
-import org.apache.tapestry5.Asset;
-import org.apache.tapestry5.MarkupWriter;
import org.apache.tapestry5.internal.InternalConstants;
import org.apache.tapestry5.ioc.Configuration;
import org.apache.tapestry5.ioc.OrderedConfiguration;
@@ -23,11 +21,14 @@ import org.apache.tapestry5.ioc.Resource
import org.apache.tapestry5.ioc.ServiceBinder;
import org.apache.tapestry5.ioc.annotations.Contribute;
import org.apache.tapestry5.ioc.annotations.Value;
-import org.apache.tapestry5.ioc.services.ThreadLocale;
import org.apache.tapestry5.kaptcha.internal.services.KaptchaDataTypeAnalyzer;
import org.apache.tapestry5.kaptcha.internal.services.KaptchaProducerImpl;
-import org.apache.tapestry5.services.*;
-import org.apache.tapestry5.services.javascript.JavaScriptSupport;
+import org.apache.tapestry5.services.BeanBlockContribution;
+import org.apache.tapestry5.services.BeanBlockSource;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.DataTypeAnalyzer;
+import org.apache.tapestry5.services.EditBlockContribution;
+import org.apache.tapestry5.services.LibraryMapping;
import org.apache.tapestry5.services.messages.ComponentMessagesSource;
/**
@@ -68,33 +69,4 @@ public class KaptchaModule
configuration.add(new EditBlockContribution("kaptcha", "KaptchaEditBlocks", "kaptcha"));
}
-
- @Contribute(MarkupRenderer.class)
- public void provideMarkupRenderer(
- OrderedConfiguration<MarkupRendererFilter> configuration,
-
- final AssetSource assetSource,
-
- final ThreadLocale threadLocale,
-
- final Environment environment)
- {
- MarkupRendererFilter importKaptchaCss = new MarkupRendererFilter()
- {
- public void renderMarkup(MarkupWriter writer, MarkupRenderer renderer)
- {
- JavaScriptSupport javaScriptSupport = environment.peek(JavaScriptSupport.class);
-
- Asset css = assetSource.getAsset(null, "org/apache/tapestry5/kaptcha/kaptcha.css",
- threadLocale.getLocale());
-
- javaScriptSupport.importStylesheet(css);
-
- renderer.renderMarkup(writer);
- }
- };
-
-
- configuration.add("KaptchaAssets", importKaptchaCss, "after:*");
- }
}
Copied: tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/resources/org/apache/tapestry5/kaptcha/components/kaptcha.css (from r1172225, tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/resources/org/apache/tapestry5/kaptcha/kaptcha.css)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/resources/org/apache/tapestry5/kaptcha/components/kaptcha.css?p2=tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/resources/org/apache/tapestry5/kaptcha/components/kaptcha.css&p1=tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/resources/org/apache/tapestry5/kaptcha/kaptcha.css&r1=1172225&r2=1172235&rev=1172235&view=diff
==============================================================================
(empty)
Propchange: tapestry/tapestry5/trunk/tapestry-kaptcha/src/main/resources/org/apache/tapestry5/kaptcha/components/kaptcha.css
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-kaptcha/src/test/resources/kaptcha/demo/pages/Index.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-kaptcha/src/test/resources/kaptcha/demo/pages/Index.tml?rev=1172235&r1=1172234&r2=1172235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-kaptcha/src/test/resources/kaptcha/demo/pages/Index.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-kaptcha/src/test/resources/kaptcha/demo/pages/Index.tml Sun Sep 18 09:28:10 2011
@@ -1,12 +1,15 @@
<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd">
- <h1>tapestry-kaptcha Demos</h1>
+ <h1>tapestry-kaptcha Demos</h1>
- <ul>
- <li>
- <t:pagelink page="kaptchaDemo">Kaptcha Demo</t:pagelink>
- </li>
- </ul>
+ <ul>
+ <li>
+ <t:pagelink page="kaptchaDemo">Kaptcha Demo</t:pagelink>
+ </li>
+ <li>
+ <t:pagelink page="kaptchabeaneditformdemo">Kaptcha BeanEditForm Demo</t:pagelink>
+ </li>
+ </ul>
</t:layout>
\ No newline at end of file