[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-Pages Added or Edited in This Space |-- AMQP0-9-DesignNotes was created by kpvdr (10:34 AM). | http://cwiki.apache.org/confluence/display/qpid/AMQP0-9-DesignNotes |-- Index was last edited by kpvdr (10:30 AM). | http://cwiki.apache.org/confluence/display/qpid/Index |-- Qpid Management Console was last edited by mmccorma (08:33 AM). | http://cwiki.apache.org/confluence/display/qpid/Qpid+Management+Console |-- roadmap was last edited by mmccorma (02:05 AM). | http://cwiki.apache.org/confluence/display/qpid/roadmap Apache Roller (ROLLER) http://cwiki.apache.org/confluence/display/ROLLER | |-Pages Added or Edited in This Space |-- Index was created by husted (09:40 AM). | http://cwiki.apache.org/confluence/display/ROLLER/Index Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- openejb-jar.xml was last edited by [EMAIL PROTECTED] (02:42 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/openejb-jar.xml Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- set was last edited by laurieh (11:37 AM). | http://cwiki.apache.org/confluence/display/WW/set |-- property was last edited by musachy (07:27 AM). | http://cwiki.apache.org/confluence/display/WW/property |-- url was last edited by musachy (07:22 AM). | http://cwiki.apache.org/confluence/display/WW/url |-- push was last edited by musachy (07:18 AM). | http://cwiki.apache.org/confluence/display/WW/push |-- param was last edited by musachy (07:16 AM). | http://cwiki.apache.org/confluence/display/WW/param |-- i18n was last edited by musachy (07:15 AM). | http://cwiki.apache.org/confluence/display/WW/i18n |-- bean was last edited by musachy (07:14 AM). | http://cwiki.apache.org/confluence/display/WW/bean |-- elseIf was last edited by musachy (07:07 AM). | http://cwiki.apache.org/confluence/display/WW/elseIf |-- Ajax Tags was last edited by musachy (07:05 AM). | http://cwiki.apache.org/confluence/display/WW/Ajax+Tags Apache Cayenne (CAY) http://cwiki.apache.org/confluence/display/CAY | |-Pages Added or Edited in This Space |-- Cayenne Established as Apache Top Level Project was created by andrus (05:09 AM). | http://cwiki.apache.org/confluence/display/CAY/2007/01/05/Cayenne+Established+as+Apache+Top+Level+Project Apache Directory Server v1.0 Documentation (DIRxSRVx10) http://cwiki.apache.org/confluence/display/DIRxSRVx10 | |-Pages Added or Edited in This Space |-- Authentication options was last edited by elecharny (08:41 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Authentication+options Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI | |-Pages Added or Edited in This Space |-- Struts 2 + Spring 2 + JPA + AJAX was last edited by musachy (08:30 AM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33168 UIMA (UIMA) http://cwiki.apache.org/confluence/display/UIMA | |-Pages Added or Edited in This Space |-- CasAndCasViewInterfaceRedesign was last edited by alally (02:16 PM). | http://cwiki.apache.org/confluence/display/UIMA/CasAndCasViewInterfaceRedesign |-- Extracting from SVN components into Eclipse Projects was created by schor (12:10 PM). | http://cwiki.apache.org/confluence/display/UIMA/Extracting+from+SVN+components+into+Eclipse+Projects |-- Index was last edited by schor (11:48 AM). | http://cwiki.apache.org/confluence/display/UIMA/Index |-- MergeJCasType was last edited by schor (11:38 AM). | http://cwiki.apache.org/confluence/display/UIMA/MergeJCasType | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/UIMA/CasAndCasViewInterfaceRedesign (1) Apache Directory LDAP Studio (DIRxSTUDIO) http://cwiki.apache.org/confluence/display/DIRxSTUDIO | |-Pages Added or Edited in This Space |-- Roadmap was created by seelmann (12:31 AM). | http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Roadmap |-- Developer's Guide was last edited by seelmann (12:33 AM). | http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Developer%27s+Guide Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Proposal of URL scheme for Wicket 2 was last edited by knopp (06:47 PM). | http://cwiki.apache.org/confluence/display/WICKET/Proposal+of+URL+scheme+for+Wicket+2 - CONFLUENCE INFORMATION This message is automatically generated by Confluence
svn commit: r493436 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/resources/template/simple/ test/java/org/apache/struts2/views/jsp/ui/ test/resources/org/apache/s
Author: mrdon
Date: Sat Jan 6 01:15:15 2007
New Revision: 493436
URL: http://svn.apache.org/viewvc?view=rev&rev=493436
Log:
Better handling of nulls for select tag, injected object factory into bean
component
WW-1567
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-9.txt
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?view=diff&rev=493436&r1=493435&r2=493436
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
Sat Jan 6 01:15:15 2007
@@ -25,6 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.OgnlUtil;
@@ -98,10 +99,16 @@
protected Object bean;
protected String name;
+protected ObjectFactory objectFactory;
public Bean(ValueStack stack) {
super(stack);
}
+
+@Inject
+public void setObjectFactory(ObjectFactory objectFactory) {
+this.objectFactory = objectFactory;
+}
public boolean start(Writer writer) {
boolean result = super.start(writer);
@@ -110,7 +117,7 @@
try {
String beanName = findString(name, "name", "Bean name is required.
Example: com.acme.FooBean");
-bean =
ObjectFactory.getObjectFactory().buildBean(ClassLoaderUtil.loadClass(beanName,
getClass()), stack.getContext());
+bean = objectFactory.buildBean(ClassLoaderUtil.loadClass(beanName,
getClass()), stack.getContext());
} catch (Exception e) {
log.error("Could not instantiate bean", e);
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl?view=diff&rev=493436&r1=493435&r2=493436
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Sat
Jan 6 01:15:15 2007
@@ -39,17 +39,24 @@
<@s.iterator value="parameters.list">
<#if parameters.listKey?exists>
-<#assign itemKey = stack.findValue(parameters.listKey)/>
+<#if stack.findString(parameters.listKey)?exists>
+ <#assign itemKey =
stack.findString(parameters.listKey).toString()/>
+<#else>
+ <#assign itemKey = ''/>
+
<#else>
-<#assign itemKey = stack.findValue('top')/>
+<#assign itemKey = stack.findValue('top').toString()/>
-<#assign itemKeyStr = itemKey.toString() />
<#if parameters.listValue?exists>
-<#assign itemValue = stack.findString(parameters.listValue)/>
+<#if stack.findString(parameters.listValue)?exists>
+ <#assign itemValue = stack.findString(parameters.listValue)/>
+<#else>
+ <#assign itemValue = ''/>
+
<#else>
<#assign itemValue = stack.findString('top')/>
-
+
<#if tag.contains(parameters.nameValue, itemKey) == true>
selected="selected"<#rt/>
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java?view=diff&rev=493436&r1=493435&r2=493436
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
Sat Jan 6 01:15:15 2007
@@ -208,6 +208,36 @@
verify(SelectTag.class.getResource("Select-1.txt"));
}
+
+public void testSimpleWithNulls() throws Exception {
+TestAction testAction = (TestAction) action;
+testAction.setFoo("hello");
+testAction.setList(new String[][]{
+{"hello", null},
+{null, "bar"}
+});
+
+SelectTag tag = new SelectTag();
+tag.setPageContext(pageContext);
+
svn commit: r493455 - /struts/struts1/trunk/tiles2/pom.xml
Author: apetrelli Date: Sat Jan 6 04:31:32 2007 New Revision: 493455 URL: http://svn.apache.org/viewvc?view=rev&rev=493455 Log: STR-2986 Modified module name of Struts 1 - Tiles 2 integration module. Modified: struts/struts1/trunk/tiles2/pom.xml Modified: struts/struts1/trunk/tiles2/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/pom.xml?view=diff&rev=493455&r1=493454&r2=493455 == --- struts/struts1/trunk/tiles2/pom.xml (original) +++ struts/struts1/trunk/tiles2/pom.xml Sat Jan 6 04:31:32 2007 @@ -32,7 +32,7 @@ org.apache.struts struts-tiles2 jar - Struts Tiles + Struts - Tiles 2 integration http://struts.apache.org
svn commit: r493466 - in /struts/sandbox/trunk/tiles/tiles-showcase: ./ src/main/java/org/apache/tiles/showcase/portal/ src/main/java/org/apache/tiles/showcase/rssChannel/ src/main/java/org/apache/til
Author: apetrelli Date: Sat Jan 6 05:00:16 2007 New Revision: 493466 URL: http://svn.apache.org/viewvc?view=rev&rev=493466 Log: SB-97 Ported code to Tiles 2 and Struts 1 - Tiles 2 integration module where possible. Modified: struts/sandbox/trunk/tiles/tiles-showcase/pom.xml struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java Modified: struts/sandbox/trunk/tiles/tiles-showcase/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/pom.xml?view=diff&rev=493466&r1=493465&r2=493466 == --- struts/sandbox/trunk/tiles/tiles-showcase/pom.xml (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/pom.xml Sat Jan 6 05:00:16 2007 @@ -68,9 +68,14 @@ runtime -struts -struts -1.2.9 +org.apache.struts +struts-core +1.3.6-SNAPSHOT + + +org.apache.struts +struts-tiles2 +1.3.6-SNAPSHOT Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java?view=diff&rev=493466&r1=493465&r2=493466 == --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java Sat Jan 6 05:00:16 2007 @@ -36,7 +36,7 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.tiles.actions.TilesAction; +import org.apache.struts.tiles2.actions.TilesAction; import org.apache.tiles.ComponentAttribute; import org.apache.tiles.ComponentContext; import org.apache.tiles.TilesApplicationContext; Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java?view=diff&rev=493466&r1=493465&r2=493466 == --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java Sat Jan 6 05:00:16 2007 @@ -35,7 +35,7 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.tiles.actions.TilesAction; +import org.apache.struts.tiles2.actions.TilesAction; import org.apache.tiles.ComponentAttribute; import org.apache.tiles.ComponentContext; import org.apache.tiles.TilesApplicationContext; Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java?view=diff&rev=493466&r1=493465&r2=493466 == --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java Sat Jan 6 05:00:16 2007 @@ -32,7 +32,7 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping;
svn commit: r493554 - in /struts/struts2/trunk: assembly/pom.xml core/pom.xml
Author: mrdon
Date: Sat Jan 6 11:59:42 2007
New Revision: 493554
URL: http://svn.apache.org/viewvc?view=rev&rev=493554
Log:
Upping xwork dep to 2.0.0
WW-1588
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/core/pom.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?view=diff&rev=493554&r1=493553&r2=493554
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Sat Jan 6 11:59:42 2007
@@ -103,7 +103,7 @@
opensymphony
xwork
javadoc
-2.0-SNAPSHOT
+2.0.0
${project.build.directory}/xwork-apidocs
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=493554&r1=493553&r2=493554
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Sat Jan 6 11:59:42 2007
@@ -35,7 +35,7 @@
opensymphony
xwork
- 2.0-SNAPSHOT
+ 2.0.0
sources
@@ -229,7 +229,7 @@
opensymphony
xwork
-2.0-SNAPSHOT
+2.0.0
svn commit: r493563 - in /struts/maven/trunk/struts-annotations: ./ src/main/java/org/apache/struts/annotations/ src/main/java/org/apache/struts/annotations/taglib/apt/
Author: mrdon
Date: Sat Jan 6 12:25:24 2007
New Revision: 493563
URL: http://svn.apache.org/viewvc?view=rev&rev=493563
Log:
Improving annotations and processing for html taglib docs
WW-1392
Modified:
struts/maven/trunk/struts-annotations/pom.xml
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTag.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTagAttribute.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAttribute.java
Modified: struts/maven/trunk/struts-annotations/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/pom.xml?view=diff&rev=493563&r1=493562&r2=493563
==
--- struts/maven/trunk/struts-annotations/pom.xml (original)
+++ struts/maven/trunk/struts-annotations/pom.xml Sat Jan 6 12:25:24 2007
@@ -1,73 +1,79 @@
-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";>
-
-
-org.apache.struts
-struts-master
-3
-
-
-4.0.0
-org.apache.struts
-struts-annotations
-2.0.2-SNAPSHOT
-jar
-Struts Annotations
-http://struts.apache.org
-
-
-
scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/
-
scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/
-http://svn.apache.org/viewcvs.cgi/struts/maven/trunk/
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-compiler-plugin
-
-1.5
-1.5
-
-
-
-
-
-
-
-apache.snapshots
-Apache Maven Repository (Snapshots and Test Builds)
-
scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
-
-
-apache.snapshots
-false
-Apache Maven Repository (Snapshots and Test Builds)
-
scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
-
-
-apache-site
-scp://people.apache.org/www/struts.apache.org/2.x/
-
-
-
-
-
-
-com.sun
-tools
-1.5.0
-system
-${java.home}/../lib/tools.jar
-
-
-
-junit
-junit
-3.8.1
-test
-
-
-
+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";>
+
+
+org.apache.struts
+struts-master
+3
+
+
+4.0.0
+org.apache.struts
+struts-annotations
+2.0.2-SNAPSHOT
+jar
+Struts Annotations
+http://struts.apache.org
+
+
+
scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/
+
scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/
+http://svn.apache.org/viewcvs.cgi/struts/maven/trunk/
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+1.5
+1.5
+
+
+
+
+
+
+
+apache.snapshots
+Apache Maven Repository (Snapshots and Test Builds)
+
scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
+
+
+apache.snapshots
+false
+Apache Maven Repository (Snapshots and Test Builds)
+
scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
+
+
+apache-site
+scp://people.apache.org/www/struts.apache.org/2.x/
+
+
+
+
+
+
+com.sun
+tools
+1.5.0
+system
+${java.home}/../lib/tools.jar
+
+
+
+junit
+junit
+3.8.1
+test
+
+
+
+freemarker
+freemarker
+2.3.4
+
+
+
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTag.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apa
svn commit: r493585 - in /struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations: ./ taglib/apt/
Author: mrdon
Date: Sat Jan 6 13:54:37 2007
New Revision: 493585
URL: http://svn.apache.org/viewvc?view=rev&rev=493585
Log:
code formatting for WW-1392
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTag.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTagAttribute.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAttribute.java
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTag.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTag.java?view=diff&rev=493585&r1=493584&r2=493585
==
---
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTag.java
(original)
+++
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTag.java
Sat Jan 6 13:54:37 2007
@@ -26,11 +26,17 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * An annotation to document a Struts jsp/freemarker/velocity tag
+ */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.SOURCE)
public @interface StrutsTag {
- String name();
- String tldBodyContent() default "JSP";
- String tldTagClass();
- String description();
+String name();
+
+String tldBodyContent() default "JSP";
+
+String tldTagClass();
+
+String description();
}
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTagAttribute.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTagAttribute.java?view=diff&rev=493585&r1=493584&r2=493585
==
---
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTagAttribute.java
(original)
+++
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/StrutsTagAttribute.java
Sat Jan 6 13:54:37 2007
@@ -26,13 +26,21 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * Documents an attribute to a Struts tag
+ */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.SOURCE)
public @interface StrutsTagAttribute {
- String name() default "";
- boolean required() default false;
- boolean rtexprvalue() default true;
- String description();
- String defaultValue() default "";
- String type() default "String";
+String name() default "";
+
+boolean required() default false;
+
+boolean rtexprvalue() default true;
+
+String description();
+
+String defaultValue() default "";
+
+String type() default "String";
}
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TLDAnnotationProcessorFactory.java?view=diff&rev=493585&r1=493584&r2=493585
==
---
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
(original)
+++
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
Sat Jan 6 13:54:37 2007
@@ -31,47 +31,45 @@
import com.sun.mirror.apt.AnnotationProcessors;
import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-public class TLDAnnotationProcessorFactory implements
AnnotationProcessorFactory {
+public class TLDAnnotationProcessorFactory implements
+AnnotationProcessorFactory {
- /**
- * Returns a TLD annotation processor.
- *
- * @return An annotation processor for note annotations if requested,
otherwise, returns the NO_OP
- * annotation processor.
- */
- public AnnotationProcessor getProcessorFor(Set
declarations,
- AnnotationProcessorEnvironment env) {
-AnnotationProcessor result;
-if (declarations.isEmpty()) {
- result = AnnotationProcessors.NO_OP;
-} else {
- result = new TagAnnotationProcessor(env);
+/**
+ * Returns a TLD annotation processor.
+ *
+ * @return An annotation processor for note annotations if requested,
+ * otherwise, re
svn commit: r493646 - in /struts/maven/trunk/struts-annotations/src/main: java/org/apache/struts/annotations/taglib/apt/ resources/ resources/org/ resources/org/apache/ resources/org/apache/struts/ re
Author: mrdon
Date: Sat Jan 6 21:07:43 2007
New Revision: 493646
URL: http://svn.apache.org/viewvc?view=rev&rev=493646
Log:
Adding tag template, added tag type to output
WW-1392
Added:
struts/maven/trunk/struts-annotations/src/main/resources/
struts/maven/trunk/struts-annotations/src/main/resources/org/
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAttribute.java
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java?view=diff&rev=493646&r1=493645&r2=493646
==
---
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
(original)
+++
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Sat Jan 6 21:07:43 2007
@@ -126,6 +126,7 @@
attribute.setRequired((Boolean) values.get("required"));
attribute.setRtexprvalue((Boolean) values.get("rtexprvalue"));
attribute.setDefaultValue((String) values.get("defaultValue"));
+attribute.setType((String) values.get("type"));
// add to map
Tag parentTag = tags.get(typeName);
if (parentTag != null)
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAttribute.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAttribute.java?view=diff&rev=493646&r1=493645&r2=493646
==
---
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAttribute.java
(original)
+++
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAttribute.java
Sat Jan 6 21:07:43 2007
@@ -31,6 +31,7 @@
private boolean rtexprvalue;
private String description;
private String defaultValue;
+private String type;
public String getDescription() {
return description;
@@ -70,5 +71,13 @@
public void setDefaultValue(String defaultValue) {
this.defaultValue = defaultValue;
+}
+
+public String getType() {
+return type;
+}
+
+public void setType(String type) {
+this.type = type;
}
}
Added:
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl?view=auto&rev=493646
==
---
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
(added)
+++
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Sat Jan 6 21:07:43 2007
@@ -0,0 +1,48 @@
+
+
+
+ ${tag.name}
+
+
+
+ Tag Name: ${tag.name}
+ Description
+
+
+ ${tag.description}
+
+
+
+ Attributes
+
+
+
+ Name
+ Required
+ Default
+ Evaluated
+ Type
+ Description
+
+ <#list tag.attributes as att>
+
+ ${att.name}
+ ${att.required?string}
+ ${att.defaultValue}
+ ${att.rtexprvalue?string}
+ ${att.type}
+
svn commit: r493647 - /struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Author: mrdon Date: Sat Jan 6 21:14:23 2007 New Revision: 493647 URL: http://svn.apache.org/viewvc?view=rev&rev=493647 Log: Removing back link WW-1392 Modified: struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl Modified: struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl?view=diff&rev=493647&r1=493646&r2=493647 == --- struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl (original) +++ struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl Sat Jan 6 21:14:23 2007 @@ -39,10 +39,6 @@ - - -Back to Taglib Index -
svn commit: r493648 [3/11] - in /struts/struts2/trunk/core: ./ src/main/java/org/apache/struts2/components/ src/main/java/org/apache/struts2/components/table/ src/main/resources/META-INF/ src/site/ sr
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?view=diff&rev=493648&r1=493647&r2=493648
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
Sat Jan 6 21:18:49 2007
@@ -31,6 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts.annotations.StrutsTagAttribute;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.components.template.Template;
import org.apache.struts2.components.template.TemplateEngine;
@@ -877,19 +878,12 @@
}
}
-
-/**
- * The template directory.
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="The template directory.")
public void setTemplateDir(String templateDir) {
this.templateDir = templateDir;
}
-/**
- * The theme (other than default) to use for rendering the element
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="The theme (other than default) to use for
rendering the element")
public void setTheme(String theme) {
this.theme = theme;
}
@@ -898,242 +892,152 @@
return template;
}
-/**
- * The template (other than default) to use for rendering the element
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="The template (other than default) to use
for rendering the element")
public void setTemplate(String template) {
this.template = template;
}
-/**
- * The css class to use for element
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="The css class to use for element")
public void setCssClass(String cssClass) {
this.cssClass = cssClass;
}
-/**
- * The css style definitions for element ro use
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="The css style definitions for element ro
use")
public void setCssStyle(String cssStyle) {
this.cssStyle = cssStyle;
}
-/**
- * Set the html title attribute on rendered html element
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="Set the html title attribute on rendered
html element")
public void setTitle(String title) {
this.title = title;
}
-/**
- * Set the html disabled attribute on rendered html element
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="Set the html disabled attribute on
rendered html element")
public void setDisabled(String disabled) {
this.disabled = disabled;
}
-/**
- * Label expression used for rendering a element specific label
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="Label expression used for rendering a
element specific label")
public void setLabel(String label) {
this.label = label;
}
-/**
- * define label position of form element (top/left)
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="Define label position of form element
(top/left)")
public void setLabelposition(String labelPosition) {
this.labelPosition = labelPosition;
}
-/**
- * define required position of required form element (left|right)
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="Define required position of required form
element (left|right)")
public void setRequiredposition(String requiredposition) {
this.requiredposition = requiredposition;
}
-/**
- * The name to set for element
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="The name to set for element")
public void setName(String name) {
this.name = name;
}
-/**
- * If set to true, the rendered element will indicate that input is
required
- * @s.tagattribute required="false" type="Boolean" default="false"
- */
+@StrutsTagAttribute(description="If set to true, the rendered element will
indicate that input is required", type="Boolean", defaultValue="false")
public void setRequired(String required) {
this.required = required;
}
-/**
- * Set the html tabindex attribute on rendered html element
- * @s.tagattribute required="false"
- */
+@StrutsTagAttribute(description="Set the html tabindex attribute on
rendered html element")
public void setTabindex(String tabindex) {
this.tabindex = tabindex;
svn commit: r493649 - in /struts/maven/trunk/struts-annotations: pom.xml src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
Author: mrdon
Date: Sat Jan 6 21:24:51 2007
New Revision: 493649
URL: http://svn.apache.org/viewvc?view=rev&rev=493649
Log:
Sorted tag attributes by name
WW-1392
Modified:
struts/maven/trunk/struts-annotations/pom.xml
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
Modified: struts/maven/trunk/struts-annotations/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/pom.xml?view=diff&rev=493649&r1=493648&r2=493649
==
--- struts/maven/trunk/struts-annotations/pom.xml (original)
+++ struts/maven/trunk/struts-annotations/pom.xml Sat Jan 6 21:24:51 2007
@@ -10,7 +10,7 @@
4.0.0
org.apache.struts
struts-annotations
-2.0.2-SNAPSHOT
+1.0-SNAPSHOT
jar
Struts Annotations
http://struts.apache.org
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java?view=diff&rev=493649&r1=493648&r2=493649
==
---
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
(original)
+++
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
Sat Jan 6 21:24:51 2007
@@ -23,6 +23,7 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.TreeMap;
public class Tag {
private String name;
@@ -31,7 +32,7 @@
private String description;
private boolean include = true;
private String declaredType;
-private Map attributes = new HashMap();
+private Map attributes = new TreeMap();
public String getDescription() {
return description;
svn commit: r493650 [1/11] - in /struts/struts2/trunk/core: ./ src/main/resources/META-INF/ src/site/resources/tags/
Author: mrdon Date: Sat Jan 6 21:25:33 2007 New Revision: 493650 URL: http://svn.apache.org/viewvc?view=rev&rev=493650 Log: Changed tag docs so that attributes are sorted by name WW-1392 Modified: struts/struts2/trunk/core/pom.xml struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld struts/struts2/trunk/core/src/site/resources/tags/a.html struts/struts2/trunk/core/src/site/resources/tags/action.html struts/struts2/trunk/core/src/site/resources/tags/actionerror.html struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html struts/struts2/trunk/core/src/site/resources/tags/autocompleter.html struts/struts2/trunk/core/src/site/resources/tags/checkbox.html struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html struts/struts2/trunk/core/src/site/resources/tags/combobox.html struts/struts2/trunk/core/src/site/resources/tags/component.html struts/struts2/trunk/core/src/site/resources/tags/date.html struts/struts2/trunk/core/src/site/resources/tags/datepicker.html struts/struts2/trunk/core/src/site/resources/tags/div.html struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html struts/struts2/trunk/core/src/site/resources/tags/dropdowndatetimepicker.html struts/struts2/trunk/core/src/site/resources/tags/fielderror.html struts/struts2/trunk/core/src/site/resources/tags/file.html struts/struts2/trunk/core/src/site/resources/tags/form.html struts/struts2/trunk/core/src/site/resources/tags/head.html struts/struts2/trunk/core/src/site/resources/tags/hidden.html struts/struts2/trunk/core/src/site/resources/tags/i18n.html struts/struts2/trunk/core/src/site/resources/tags/include.html struts/struts2/trunk/core/src/site/resources/tags/iterator.html struts/struts2/trunk/core/src/site/resources/tags/label.html struts/struts2/trunk/core/src/site/resources/tags/optgroup.html struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html struts/struts2/trunk/core/src/site/resources/tags/param.html struts/struts2/trunk/core/src/site/resources/tags/password.html struts/struts2/trunk/core/src/site/resources/tags/property.html struts/struts2/trunk/core/src/site/resources/tags/push.html struts/struts2/trunk/core/src/site/resources/tags/radio.html struts/struts2/trunk/core/src/site/resources/tags/reset.html struts/struts2/trunk/core/src/site/resources/tags/select.html struts/struts2/trunk/core/src/site/resources/tags/set.html struts/struts2/trunk/core/src/site/resources/tags/submit.html struts/struts2/trunk/core/src/site/resources/tags/tabbedPanel.html struts/struts2/trunk/core/src/site/resources/tags/table.html struts/struts2/trunk/core/src/site/resources/tags/text.html struts/struts2/trunk/core/src/site/resources/tags/textarea.html struts/struts2/trunk/core/src/site/resources/tags/textfield.html struts/struts2/trunk/core/src/site/resources/tags/token.html struts/struts2/trunk/core/src/site/resources/tags/tree.html struts/struts2/trunk/core/src/site/resources/tags/treenode.html struts/struts2/trunk/core/src/site/resources/tags/url.html Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=493650&r1=493649&r2=493650 == --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Sat Jan 6 21:25:33 2007 @@ -452,7 +452,7 @@ org.apache.struts struts-annotations -1.0 +1.0-SNAPSHOT compile
svn commit: r493654 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/TimePicker.java main/resources/META-INF/struts-tags.tld site/resources/tags/timepicker.html
Author: mrdon
Date: Sat Jan 6 21:43:03 2007
New Revision: 493654
URL: http://svn.apache.org/viewvc?view=rev&rev=493654
Log:
Adding missing timepicker tag
WW-1392
Added:
struts/struts2/trunk/core/src/site/resources/tags/timepicker.html
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java
struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java?view=diff&rev=493654&r1=493653&r2=493654
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java
Sat Jan 6 21:43:03 2007
@@ -35,6 +35,7 @@
*
* @version $Date$ $Id$
*/
[EMAIL PROTECTED](name="timepicker",
tldTagClass="org.apache.struts2.views.jsp.ui.TimePickerTag",
description="Render timepicker")
public class TimePicker extends TextField {
final public static String TEMPLATE = "timepicker";
Modified: struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld?view=diff&rev=493654&r1=493653&r2=493654
==
--- struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
(original)
+++ struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld Sat
Jan 6 21:43:03 2007
@@ -12,6 +12,24 @@
to ensure that input is correct and output is localized.
The Struts Tags can be used with JSP FreeMarker or
Velocity."]]>
+push
+org.apache.struts2.views.jsp.PushTag
+JSP
+
+
+ id
+ false
+ true
+
+
+
+ value
+ true
+ true
+
+
+
+
doubleselect
org.apache.struts2.views.jsp.ui.DoubleSelectTag
JSP
@@ -444,24 +462,6 @@
-push
-org.apache.struts2.views.jsp.PushTag
-JSP
-
-
- id
- false
- true
-
-
-
- value
- true
- true
-
-
-
-
optiontransferselect
org.apache.struts2.views.jsp.ui.OptionTransferSelectTag
JSP
@@ -1800,36 +1800,6 @@
-property
-org.apache.struts2.views.jsp.PropertyTag
-empty
-
-
- default
- false
- true
-
-
-
- escape
- false
- true
-
-
-
- id
- false
- true
-
-
-
- value
- false
- true
-
-
-
-
datepicker
org.apache.struts2.views.jsp.ui.DatePickerTag
JSP
@@ -2082,6 +2052,36 @@
+property
+org.apache.struts2.views.jsp.PropertyTag
+empty
+
+
+ default
+ false
+ true
+
+
+
+ escape
+ false
+ true
+
+
+
+ id
+ false
+ true
+
+
+
+ value
+ false
+ true
+
+
+
+
optgroup
org.apache.struts2.views.jsp.ui.OptGroupTag
JSP
@@ -2105,22 +2105,268 @@
- list
+ list
+ false
+ true
+
+
+
+ listKey
+ false
+ true
+
+
+
+ listValue
+ false
+ true
+
+
+
+
+timepicker
+org.apache.struts2.views.jsp.ui.TimePickerTag
+JSP
+
+
+ accesskey
+ false
+ true
+
+
+
+ cssClass
+ false
+ true
+
+
+
+ cssStyle
+ false
+ true
+
+
+
+ disabled
+ false
+ true
+
+
+
+ id
+ false
+ true
+
+
+
+ key
+ false
+ true
+
+
+
+ label
+ false
+ true
+
+
+
+ labelposition
+ false
+ true
+
+
+
+ language
+ false
+ true
+
+
+
+ maxLength
+ false
+ true
+
+
+
+ maxlength
+ false
+ true
+
+
+
+ name
+ false
+ true
+
+
+
+ onblur
+ false
+ true
+
+
+
+ onchange
+ false
+ true
+
+
+
+ onclick
+ false
+ true
+
+
+
+ ondblclick
+ false
+ true
+
+
+
+ onfocus
+ false
+ true
+
+
+
+ onkeydown
+ false
+ true
+
+
+
+ onkeypress
+ false
+ true
+
+
+
+ onkeyup
+ false
+ true
+
+
+
+ onmousedown
+ false
+ true
+
+
+
+ on
svn commit: r493655 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/components/UpDownSelect.java resources/META-INF/struts-tags.tld
Author: mrdon
Date: Sat Jan 6 21:48:17 2007
New Revision: 493655
URL: http://svn.apache.org/viewvc?view=rev&rev=493655
Log:
Adding updownselect tag to taglib
WW-1392
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java?view=diff&rev=493655&r1=493654&r2=493655
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
Sat Jan 6 21:48:17 2007
@@ -77,6 +77,8 @@
* @s.tag name="updownselect" tld-body-content="JSP"
tld-tag-class="org.apache.struts2.views.jsp.ui.UpDownSelectTag"
* description="Render a up down select element"
*/
[EMAIL PROTECTED](name="updownselect",
tldTagClass="org.apache.struts2.views.jsp.ui.UpDownSelectTag",
+description="Create a Select component with buttons to move the
elements in the select component up and down")
public class UpDownSelect extends Select {
private static final Log _log = LogFactory.getLog(UpDownSelect.class);
Modified: struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld?view=diff&rev=493655&r1=493654&r2=493655
==
--- struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
(original)
+++ struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld Sat
Jan 6 21:48:17 2007
@@ -1596,10 +1596,40 @@
-hidden
-org.apache.struts2.views.jsp.ui.HiddenTag
+property
+org.apache.struts2.views.jsp.PropertyTag
+empty
+
+
+ default
+ false
+ true
+
+
+
+ escape
+ false
+ true
+
+
+
+ id
+ false
+ true
+
+
+
+ value
+ false
+ true
+
+
+
+
+datepicker
+org.apache.struts2.views.jsp.ui.DatePickerTag
JSP
-
+
accesskey
false
@@ -1607,6 +1637,12 @@
+ adjustWeeks
+ false
+ true
+
+
+
cssClass
false
true
@@ -1619,12 +1655,30 @@
+ dayWidth
+ false
+ true
+
+
+
disabled
false
true
+ displayWeeks
+ false
+ true
+
+
+
+ endDate
+ false
+ true
+
+
+
id
false
true
@@ -1649,6 +1703,12 @@
+ language
+ false
+ true
+
+
+
name
false
true
@@ -1751,6 +1811,18 @@
+ startDate
+ false
+ true
+
+
+
+ staticDisplay
+ false
+ true
+
+
+
tabindex
false
true
@@ -1798,12 +1870,18 @@
true
+
+ weekStartsOn
+ false
+ true
+
+
-datepicker
-org.apache.struts2.views.jsp.ui.DatePickerTag
+hidden
+org.apache.struts2.views.jsp.ui.HiddenTag
JSP
-
+
accesskey
false
@@ -1811,12 +1889,6 @@
- adjustWeeks
- false
- true
-
-
-
cssClass
false
true
@@ -1829,30 +1901,12 @@
- dayWidth
- false
- true
-
-
-
disabled
false
true
- displayWeeks
- false
- true
-
-
-
- endDate
- false
- true
-
-
-
id
false
true
@@ -1877,12 +1931,6 @@
- language
- false
- true
-
-
-
name
false
true
@@ -1985,18 +2033,6 @@
- startDate
- false
- true
-
-
-
- staticDisplay
- false
- true
-
-
-
tabindex
false
true
@@ -2044,42 +2080,6 @@
true
-
- weekStartsOn
- false
- true
-
-
-
-
-property
-org.apache.struts2.views.jsp.PropertyTag
-empty
-
-
- default
- false
- true
-
-
-
- escape
- false
- true
-
-
-
- id
- false
- true
-
-
-
- value
- false
- true
-
-
optgroup
@@ -5100,10 +5100,10 @@
-head
-org.apache.struts2.views.jsp.ui.HeadTag
-empty
svn commit: r493656 - /struts/struts2/trunk/core/src/site/resources/tags/updownselect.html
Author: mrdon Date: Sat Jan 6 21:48:53 2007 New Revision: 493656 URL: http://svn.apache.org/viewvc?view=rev&rev=493656 Log: Adding updownselect docs WW-1392 Added: struts/struts2/trunk/core/src/site/resources/tags/updownselect.html Added: struts/struts2/trunk/core/src/site/resources/tags/updownselect.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/updownselect.html?view=auto&rev=493656 == --- struts/struts2/trunk/core/src/site/resources/tags/updownselect.html (added) +++ struts/struts2/trunk/core/src/site/resources/tags/updownselect.html Sat Jan 6 21:48:53 2007 @@ -0,0 +1,410 @@ + + + + updownselect + + + + Tag Name: updownselect + Description + + + Create a Select component with buttons to move the elements in the select component up and down + + + + Attributes + + + + Name + Required + Default + Evaluated + Type + Description + + + accesskey + false + + true + String + Set the html accesskey attribute on rendered html element + + + allowMoveDown + false + true + true + Boolean + Whether move down button should be displayed + + + allowMoveUp + false + true + true + Boolean + Whether move up button should be displayed + + + allowSelectAll + false + true + true + Boolean + Whether or not select all button should be displayed + + + cssClass + false + + true + String + The css class to use for element + + + cssStyle + false + + true + String + The css style definitions for element ro use + + + disabled + false + + true + String + Set the html disabled attribute on rendered html element + + + emptyOption + false + false + true + Boolean + Whether or not to add an empty (--) option after the header option + + + headerKey + false + + true + String +Key for first item in list. Must not be empty! '-1' and '' is correct, '' is bad. + + + headerValue
svn commit: r493657 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java
Author: mrdon Date: Sat Jan 6 21:52:27 2007 New Revision: 493657 URL: http://svn.apache.org/viewvc?view=rev&rev=493657 Log: Cleaning up div javadocs WW-1392 Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java?view=diff&rev=493657&r1=493656&r2=493657 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java Sat Jan 6 21:52:27 2007 @@ -36,7 +36,7 @@ * It creates a HTML that obtains it's content via a remote XMLHttpRequest call via * the dojo framework. * - * + * * * THE FOLLOWING IS ONLY VALID WHEN AJAX IS CONFIGURED * @@ -82,9 +82,9 @@ * type: 'before' before the request is made, 'load' when the request succeeds, or 'error' when it fails * request: request javascript object, when type='load' or type='error' * - + * * - * Examples + * Examples * * * @@ -101,6 +101,7 @@ *> * * + * * */ @StrutsTag(name="div", tldTagClass="org.apache.struts2.views.jsp.ui.DivTag", description="Render HTML div providing content from remote call via AJAX")
svn commit: r493658 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java
Author: mrdon Date: Sat Jan 6 21:55:26 2007 New Revision: 493658 URL: http://svn.apache.org/viewvc?view=rev&rev=493658 Log: Trying again to clean div javadocs WW-1392 Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java?view=diff&rev=493658&r1=493657&r2=493658 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java Sat Jan 6 21:55:26 2007 @@ -31,12 +31,12 @@ /** * * The div tag when used on the ajax theme, provides a remote call - * from the current page to update a section of content without having to refresh the entire page. - * - * It creates a HTML that obtains it's content via a remote XMLHttpRequest call via - * the dojo framework. - * + * from the current page to update a section of content without having to refresh the entire page. * + * It creates a HTML that obtains it's content via a remote XMLHttpRequest call via + * the dojo framework. + * + * * * THE FOLLOWING IS ONLY VALID WHEN AJAX IS CONFIGURED * @@ -76,15 +76,14 @@ * 'listenTopics' comma separated list of topics names, that will trigger a request * 'indicator' element to be shown while the request executing * 'showErrorTransportText': whether errors should be displayed (on 'targets') - * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed: + * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed: * * data: html or json object when type='load' or type='error' * type: 'before' before the request is made, 'load' when the request succeeds, or 'error' when it fails * request: request javascript object, when type='load' or type='error' * - * * - * Examples + * Examples * * *
svn commit: r493659 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java
Author: mrdon Date: Sat Jan 6 21:56:19 2007 New Revision: 493659 URL: http://svn.apache.org/viewvc?view=rev&rev=493659 Log: Ok, last clean of div javadocs... WW-1392 Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java?view=diff&rev=493659&r1=493658&r2=493659 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java Sat Jan 6 21:56:19 2007 @@ -81,7 +81,7 @@ * data: html or json object when type='load' or type='error' * type: 'before' before the request is made, 'load' when the request succeeds, or 'error' when it fails * request: request javascript object, when type='load' or type='error' - * + * * * Examples *
svn commit: r493660 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java
Author: mrdon Date: Sat Jan 6 22:10:10 2007 New Revision: 493660 URL: http://svn.apache.org/viewvc?view=rev&rev=493660 Log: Fixing anchor tag javadoc WW-1392 Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java?view=diff&rev=493660&r1=493659&r2=493660 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java Sat Jan 6 22:10:10 2007 @@ -76,7 +76,7 @@ * data: html or json object when type='load' or type='error' * type: 'before' before the request is made, 'load' when the request succeeds, or 'error' when it fails * request: request javascript object, when type='load' or type='error' - * + * * * * Examples
svn commit: r493661 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/resources/META-INF/ site/resources/tags/
Author: mrdon
Date: Sat Jan 6 22:16:04 2007
New Revision: 493661
URL: http://svn.apache.org/viewvc?view=rev&rev=493661
Log:
Added bean tag to taglib
WW-1392
Added:
struts/struts2/trunk/core/src/site/resources/tags/bean.html
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?view=diff&rev=493661&r1=493660&r2=493661
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
Sat Jan 6 22:16:04 2007
@@ -24,6 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts.annotations.StrutsTag;
import org.apache.struts.annotations.StrutsTagAttribute;
import com.opensymphony.xwork2.inject.Inject;
@@ -91,10 +92,9 @@
*
*
* @see Param
- *
- * @s.tag name="bean" tld-body-content="JSP"
tld-tag-class="org.apache.struts2.views.jsp.BeanTag"
- * description="Instantiate a JavaBean and place it in the context."
*/
[EMAIL PROTECTED](name="bean",
tldTagClass="org.apache.struts2.views.jsp.BeanTag",
+description="Instantiate a JavaBean and place it in the context")
public class Bean extends Component {
protected static Log log = LogFactory.getLog(Bean.class);
Modified: struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld?view=diff&rev=493661&r1=493660&r2=493661
==
--- struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
(original)
+++ struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld Sat
Jan 6 22:16:04 2007
@@ -116,7 +116,7 @@
doubleListKey
false
true
-
+
doubleListValue
@@ -626,7 +626,7 @@
doubleListKey
false
true
-
+
doubleListValue
@@ -1014,6 +1014,42 @@
+bean
+org.apache.struts2.views.jsp.BeanTag
+JSP
+
+
+ id
+ false
+ true
+
+
+
+ name
+ true
+ true
+
+
+
+
+text
+org.apache.struts2.views.jsp.TextTag
+JSP
+
+
+ id
+ false
+ true
+
+
+
+ name
+ true
+ true
+
+
+
+
label
org.apache.struts2.views.jsp.ui.LabelTag
JSP
@@ -1224,10 +1260,34 @@
-text
-org.apache.struts2.views.jsp.TextTag
+hidden
+org.apache.struts2.views.jsp.ui.HiddenTag
JSP
-
+
+
+ accesskey
+ false
+ true
+
+
+
+ cssClass
+ false
+ true
+
+
+
+ cssStyle
+ false
+ true
+
+
+
+ disabled
+ false
+ true
+
+
id
false
@@ -1235,10 +1295,172 @@
+ key
+ false
+ true
+
+
+
+ label
+ false
+ true
+
+
+
+ labelposition
+ false
+ true
+
+
+
name
- true
+ false
true
-
+
+
+
+ onblur
+ false
+ true
+
+
+
+ onchange
+ false
+ true
+
+
+
+ onclick
+ false
+ true
+
+
+
+ ondblclick
+ false
+ true
+
+
+
+ onfocus
+ false
+ true
+
+
+
+ onkeydown
+ false
+ true
+
+
+
+ onkeypress
+ false
+ true
+
+
+
+ onkeyup
+ false
+ true
+
+
+
+ onmousedown
+ false
+ true
+
+
+
+ onmousemove
+ false
+ true
+
+
+
+ onmouseout
+ false
+ true
+
+
+
+ onmouseover
+ false
+ true
+
+
+
+ onmouseup
+ false
+ true
+
+
+
+ onselect
+ false
+ true
+
+
+
+ required
+ false
+ true
+
+
+
+ requiredposition
+ false
+ true
+
+
+
+ tabindex
+ false
+ true
+
+
+
+ template
+ false
+ true
+
+
+
+ templateDir
+ false
+ true
+
+
+
+ theme
+ false
+ t
svn commit: r493663 - /struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Author: mrdon
Date: Sat Jan 6 22:24:20 2007
New Revision: 493663
URL: http://svn.apache.org/viewvc?view=rev&rev=493663
Log:
Added emphasis for required attributes
WW-1392
Modified:
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Modified:
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl?view=diff&rev=493663&r1=493662&r2=493663
==
---
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
(original)
+++
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Sat Jan 6 22:24:20 2007
@@ -30,7 +30,13 @@
<#list tag.attributes as att>
${att.name}
- ${att.required?string}
+
+<#if att.required>
+true
+<#else>
+false
+
+
${att.defaultValue}
${att.rtexprvalue?string}
${att.type}
svn commit: r493664 - /struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Author: mrdon
Date: Sat Jan 6 22:28:26 2007
New Revision: 493664
URL: http://svn.apache.org/viewvc?view=rev&rev=493664
Log:
Better formatting for emphasised required attributes
WW-1392
Modified:
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Modified:
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl?view=diff&rev=493664&r1=493663&r2=493664
==
---
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
(original)
+++
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Sat Jan 6 22:28:26 2007
@@ -30,13 +30,7 @@
<#list tag.attributes as att>
${att.name}
-
-<#if att.required>
-true
-<#else>
-false
-
-
+ <#if
att.required>true<#else>false
${att.defaultValue}
${att.rtexprvalue?string}
${att.type}
svn commit: r493665 [2/2] - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/resources/META-INF/ site/resources/tags/
Modified: struts/struts2/trunk/core/src/site/resources/tags/updownselect.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/updownselect.html?view=diff&rev=493665&r1=493664&r2=493665 == --- struts/struts2/trunk/core/src/site/resources/tags/updownselect.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/updownselect.html Sat Jan 6 22:28:54 2007 @@ -141,7 +141,7 @@ list - true + true true String
svn commit: r493666 - in /struts/struts2/trunk: core/src/main/xdt/ docs/
Author: mrdon Date: Sat Jan 6 22:31:35 2007 New Revision: 493666 URL: http://svn.apache.org/viewvc?view=rev&rev=493666 Log: Removing old generated tag docs and xdoclet templates Removed: struts/struts2/trunk/core/src/main/xdt/ struts/struts2/trunk/docs/
svn commit: r493668 - /struts/maven/trunk/struts-annotations/pom.xml
Author: mrdon Date: Sat Jan 6 22:39:17 2007 New Revision: 493668 URL: http://svn.apache.org/viewvc?view=rev&rev=493668 Log: Switching to the latest pom Modified: struts/maven/trunk/struts-annotations/pom.xml Modified: struts/maven/trunk/struts-annotations/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/pom.xml?view=diff&rev=493668&r1=493667&r2=493668 == --- struts/maven/trunk/struts-annotations/pom.xml (original) +++ struts/maven/trunk/struts-annotations/pom.xml Sat Jan 6 22:39:17 2007 @@ -4,7 +4,7 @@ org.apache.struts struts-master -3 +4 4.0.0
