[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo v1.2 (GMOxDOC12) http://cwiki.apache.org/confluence/display/GMOxDOC12 | |-Pages Added or Edited in This Space |-- DB Pool Testing sample application (1.2 Ok) was last edited by hcunico (07:45 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/DB+Pool+Testing+sample+application+%281.2+Ok%29 Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Incubator Status Report (January 2007) was last edited by [EMAIL PROTECTED] (11:08 AM). | http://cwiki.apache.org/confluence/display/FELIX/Incubator+Status+Report+%28January+2007%29 |-- Incubator Status Report (October 2006) was last edited by [EMAIL PROTECTED] (10:42 AM). | http://cwiki.apache.org/confluence/display/FELIX/Incubator+Status+Report+%28October+2006%29 Apache Geronimo SandBox (GMOxSBOX) http://cwiki.apache.org/confluence/display/GMOxSBOX | |-Pages Added or Edited in This Space |-- Index was last edited by hcunico (01:19 PM). | http://cwiki.apache.org/confluence/display/GMOxSBOX/Index Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-Pages Added or Edited in This Space |-- Navigation was last edited by cctrieloff (11:19 AM). | http://cwiki.apache.org/confluence/display/qpid/Navigation |-- AMQP0-9-DesignNotes was last edited by kpvdr (08:39 AM). | http://cwiki.apache.org/confluence/display/qpid/AMQP0-9-DesignNotes |-- People was last edited by rgreig (05:15 AM). | http://cwiki.apache.org/confluence/display/qpid/People Apache Struts 2 Plugin Registry (S2PLUGINS) http://cwiki.apache.org/confluence/display/S2PLUGINS | |-Pages Added or Edited in This Space |-- GWT Plugin was created by musachy (03:51 PM). | http://cwiki.apache.org/confluence/display/S2PLUGINS/GWT+Plugin |-- GWT Plugin was created by musachy (03:45 PM). | http://cwiki.apache.org/confluence/display/S2PLUGINS/2007/01/10/GWT+Plugin Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- JBoss to Geronimo - EJB-MDB Migration was created by [EMAIL PROTECTED] (10:35 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/JBoss+to+Geronimo+-+EJB-MDB+Migration |-- Migrating to Apache Geronimo was last edited by [EMAIL PROTECTED] (10:34 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/Migrating+to+Apache+Geronimo |-- openejb-jar.xml was last edited by [EMAIL PROTECTED] (04:01 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 |-- Comparing Struts 1 and 2 was last edited by musachy (11:32 AM). | http://cwiki.apache.org/confluence/display/WW/Comparing+Struts+1+and+2 Apache Cayenne (CAY) http://cwiki.apache.org/confluence/display/CAY | |-Pages Added or Edited in This Space |-- Release Guide was last edited by andrus (10:06 AM). | http://cwiki.apache.org/confluence/display/CAY/Release+Guide Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Articles about Wicket was last edited by [EMAIL PROTECTED] (11:47 PM). | http://cwiki.apache.org/confluence/display/WICKET/Articles+about+Wicket |-- Getting user confirmation was last edited by loren (01:40 PM). | http://cwiki.apache.org/confluence/display/WICKET/Getting+user+confirmation |-- Validating related fields was created by loren (10:40 AM). | http://cwiki.apache.org/confluence/display/WICKET/Validating+related+fields - Updated User Profiles: - star |- http://cwiki.apache.org/confluence/display/~star - CONFLUENCE INFORMATION This message is automatically generated by Confluence Unsubscribe or edit your notifications preferences http://cwiki.apache.org/confluence/users/viewnotifications.action If you think it was sent incorrectly contact one of the administrators http://cwiki.apache.org/confluence/administrators.action If you want more information on Confluence, or have a bug to report see http://www.atlassian.com/software/confluence
svn commit: r495217 - in /struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp: WEB-INF/ doc/portal/ layout/ layouts/
Author: apetrelli Date: Thu Jan 11 05:45:54 2007 New Revision: 495217 URL: http://svn.apache.org/viewvc?view=rev&rev=495217 Log: SB-92 More fixes to let the examples homepage being shown. Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-config.xml struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/portal/revisions.jsp struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/columnsLayout.jsp struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/menu.jsp struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-config.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-config.xml?view=diff&rev=495217&r1=495216&r2=495217 == --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-config.xml (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-config.xml Thu Jan 11 05:45:54 2007 @@ -45,6 +45,8 @@ type="org.apache.struts.tiles.actions.ReloadDefinitionsAction"/> + Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml?view=diff&rev=495217&r1=495216&r2=495217 == --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml Thu Jan 11 05:45:54 2007 @@ -87,7 +87,7 @@ - + @@ -95,15 +95,15 @@ - + - + - + @@ -126,7 +126,7 @@ - + Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml?view=diff&rev=495217&r1=495216&r2=495217 == --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml Thu Jan 11 05:45:54 2007 @@ -82,14 +82,14 @@ - + @@ -102,13 +102,13 @@ http://www.apache.org"; icon="/images/struts-power.gif" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> + classtype="org.apache.tiles.beans.SimpleMenuItem" /> - + @@ -119,7 +119,7 @@ - + @@ -128,7 +128,7 @@ - + Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml?view=diff&rev=495217&r1=495216&r2=495217 == --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml Thu Jan 11 05:45:54 2007 @@ -56,7 +56,7 @@ - + Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml?view=diff&rev=495217&r1=495216&r2=495217 == --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml Thu Jan 11 05:45:54 2007 @@ -39,7 +39,7 @@ - + Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/portal/revisions.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles
svn commit: r495228 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
Author: ddewolf Date: Thu Jan 11 05:57:55 2007 New Revision: 495228 URL: http://svn.apache.org/viewvc?view=rev&rev=495228 Log: adding default param for stream result so that it can be used with auto-config annotated results Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java?view=diff&rev=495228&r1=495227&r2=495228 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java Thu Jan 11 05:57:55 2007 @@ -82,6 +82,8 @@ protected static final Log log = LogFactory.getLog(StreamResult.class); +public static final String DEFAULT_PARAM = "inputName"; + protected String contentType = "text/plain"; protected String contentLength; protected String contentDisposition = "inline";
[Struts Wiki] Update of "PoweredBy" by Scott K Purcell
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by Scott K Purcell: http://wiki.apache.org/struts/PoweredBy -- * http://www.agileedge.com - Agility Bug Tracker * http://telemetry.logica.co.uk - Master Control - telemetry on the web, produced by LogicaCMG built on Tomcat. * http://openmozart.net + * http://www.theuniquepear.com * http://www.hotels.com - Several parts of hotels.com use Struts * http://bugs.sun.com/bugdatabase - Sun's bug tracker for Java * http://www.vodafone.co.uk/livestudio - Vodafone's multimedia site for MMS devices
[Struts Wiki] Update of "PoweredBy" by Scott K Purcell
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by Scott K Purcell: http://wiki.apache.org/struts/PoweredBy -- * http://www.agileedge.com - Agility Bug Tracker * http://telemetry.logica.co.uk - Master Control - telemetry on the web, produced by LogicaCMG built on Tomcat. * http://openmozart.net - * http://www.theuniquepear.com + * http://www.theuniquepear.com - ECommerce Site - Stylish Home Decor and Accessories * http://www.hotels.com - Several parts of hotels.com use Struts * http://bugs.sun.com/bugdatabase - Sun's bug tracker for Java * http://www.vodafone.co.uk/livestudio - Vodafone's multimedia site for MMS devices
svn commit: r495339 [2/2] - in /struts/struts2/trunk: apps/showcase/src/main/java/org/apache/struts2/showcase/ apps/showcase/src/main/resources/ apps/showcase/src/main/webapp/tags/ui/ core/src/main/ja
Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTagTest.java -- svn:eol-style = native Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTagTest.java -- svn:keywords = Id Author Date Rev Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt?view=auto&rev=495339 == --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt (added) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt Thu Jan 11 11:20:51 2007 @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + ItemOne + ItemTwo + + + + + \ No newline at end of file
svn commit: r495341 - in /struts/struts2/trunk: apps/showcase/src/main/java/org/apache/struts2/showcase/ core/src/main/java/org/apache/struts2/components/ core/src/main/java/org/apache/struts2/views/f
Author: ddewolf Date: Thu Jan 11 11:25:30 2007 New Revision: 495341 URL: http://svn.apache.org/viewvc?view=rev&rev=495341 Log: Adding license headers to files Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTagTest.java Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java?view=diff&rev=495341&r1=495340&r2=495341 == --- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java (original) +++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java Thu Jan 11 11:25:30 2007 @@ -1,3 +1,23 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.struts2.showcase; import com.opensymphony.xwork2.ActionSupport; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java?view=diff&rev=495341&r1=495340&r2=495341 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java Thu Jan 11 11:25:30 2007 @@ -1,3 +1,23 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.struts2.components; import org.apache.struts.annotations.StrutsTag; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java?view=diff&rev=495341&r1=495340&r2=495341 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java Thu Jan 11 11:25:30 2007 @@ -1,3 +1,23 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 +
svn commit: r495431 - in /struts/sandbox/trunk/tiles/tiles-core/src/main: java/org/apache/tiles/taglib/ java/org/apache/tiles/taglib/definition/ resources/META-INF/tld/
Author: germuska
Date: Thu Jan 11 15:35:47 2007
New Revision: 495431
URL: http://svn.apache.org/viewvc?view=rev&rev=495431
Log:
Fixes for TILES-1 (Rename PutTag to PutAttributeTag and AttributeTag to
InsertAttributeTag) and TILES-2 (Correct implementation of PutListTag).
Added:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
- copied, changed from r495428,
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
- copied, changed from r495428,
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutTag.java
Removed:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutTag.java
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutListTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutTagParent.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/InitContainerTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/resources/META-INF/tld/tiles-core.tld
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java?view=diff&rev=495431&r1=495430&r2=495431
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
Thu Jan 11 15:35:47 2007
@@ -26,17 +26,12 @@
import org.apache.tiles.ComponentContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
-import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.access.TilesAccess;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
import java.io.IOException;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
/**
* Base tag for the tiles tags which interact with the container.
@@ -66,6 +61,17 @@
this.role = role;
}
+/**
+ * By default, all ContainerTags evaluate their body. Subclasses may
choose to be more selective.
+ * In any case, children can rely upon the container and componentContext
being initialized if they
+ * call super.doStartTag()
+ */
+public int doStartTag() {
+container = TilesAccess.getContainer(pageContext.getServletContext());
+componentContext = container.getComponentContext(pageContext);
+return EVAL_BODY_BUFFERED;
+}
+
public int doEndTag() throws JspException {
if (isAccessAllowed()) {
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
(from r495428,
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTag.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java?view=diff&rev=495431&p1=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTag.java&r1=495428&p2=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java&r2=495431
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTag.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
Thu Jan 11 15:35:47 2007
@@ -25,11 +25,9 @@
import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.ComponentContext;
import org.apache.tiles.TilesException;
-import org.apache.tiles.context.jsp.JspUtil;
import javax.servlet.jsp.JspException;
import java.io.IOException;
-import java.util.Map;
/**
* This is the tag handler for , which defines an
@@ -38,15 +36,13 @@
*
* @version $Rev$ $Date$
*/
-public class Attri
svn commit: r495496 - in /struts/struts2/trunk/apps/showcase/src/main: java/org/apache/struts2/showcase/ java/org/apache/struts2/showcase/action/ java/org/apache/struts2/showcase/conversion/ java/org/
Author: mrdon Date: Thu Jan 11 22:47:54 2007 New Revision: 495496 URL: http://svn.apache.org/viewvc?view=rev&rev=495496 Log: Removed duplicate resources in java tree, moved over missing files WW-1538 Added: struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/AddressAction-conversion.properties - copied unchanged from r495470, struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction-conversion.properties struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/OperationsEnumAction-conversion.properties - copied unchanged from r495470, struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction-conversion.properties Removed: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample-conversion.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction-conversion.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction-validation.xml struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction_de.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction-validation.xml struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction_de.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction-conversion.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction-conversion.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-conversion.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.properties struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction-validation.xml struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User-userContext-validation.xml struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
svn commit: r495498 - /struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
Author: mrdon Date: Thu Jan 11 22:51:24 2007 New Revision: 495498 URL: http://svn.apache.org/viewvc?view=rev&rev=495498 Log: Renamed datepicker to datetimepicker WW-1538 Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp?view=diff&rev=495498&r1=495497&r2=495498 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp Thu Jan 11 22:51:24 2007 @@ -23,7 +23,7 @@ - +
svn commit: r495502 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/portlet/context/PortletActionContext.java test/java/org/apache/struts2/portlet/context/PortletActionContextTest.ja
Author: mrdon
Date: Thu Jan 11 23:15:43 2007
New Revision: 495502
URL: http://svn.apache.org/viewvc?view=rev&rev=495502
Log:
Fixing getActionForMode on portlet context
WW-1636
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java?view=diff&rev=495502&r1=495501&r2=495502
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
Thu Jan 11 23:15:43 2007
@@ -30,6 +30,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.portlet.PortletActionConstants;
import com.opensymphony.xwork2.ActionContext;
@@ -176,12 +177,12 @@
}
/**
- * Get the default action name for the current mode.
+ * Get the default action mapping for the current mode.
*
- * @return The default action name for the current portlet mode.
+ * @return The default action mapping for the current portlet mode.
*/
-public static String getDefaultActionForMode() {
-return (String)getContext().get(DEFAULT_ACTION_FOR_MODE);
+public static ActionMapping getDefaultActionForMode() {
+return (ActionMapping)getContext().get(DEFAULT_ACTION_FOR_MODE);
}
/**
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java?view=diff&rev=495502&r1=495501&r2=495502
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
Thu Jan 11 23:15:43 2007
@@ -31,6 +31,7 @@
import junit.textui.TestRunner;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.portlet.PortletActionConstants;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
@@ -166,8 +167,9 @@
}
public void testGetDefaultActionForMode() {
-context.put(PortletActionConstants.DEFAULT_ACTION_FOR_MODE,
"testAction");
-assertEquals("testAction",
PortletActionContext.getDefaultActionForMode());
+ActionMapping mapping = new ActionMapping();
+context.put(PortletActionConstants.DEFAULT_ACTION_FOR_MODE, mapping);
+assertEquals(mapping, PortletActionContext.getDefaultActionForMode());
}
public void tearDown() throws Exception {
svn commit: r495503 - in /struts/struts2/trunk/apps/portlet/src/main/resources: struts.xml xwork.xml
Author: mrdon Date: Thu Jan 11 23:25:05 2007 New Revision: 495503 URL: http://svn.apache.org/viewvc?view=rev&rev=495503 Log: Renamed xwork.xml to struts.xml on portlet example WW-1638 Added: struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml - copied unchanged from r495470, struts/struts2/trunk/apps/portlet/src/main/resources/xwork.xml Removed: struts/struts2/trunk/apps/portlet/src/main/resources/xwork.xml
svn commit: r495504 - in /struts/struts2/trunk/core/src/main/resources: struts-plugin-default.xml struts-portlet-default.xml
Author: mrdon Date: Thu Jan 11 23:26:44 2007 New Revision: 495504 URL: http://svn.apache.org/viewvc?view=rev&rev=495504 Log: Fixed wrong named plugin default WW-1638 Added: struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml - copied unchanged from r495470, struts/struts2/trunk/core/src/main/resources/struts-plugin-default.xml Removed: struts/struts2/trunk/core/src/main/resources/struts-plugin-default.xml
svn commit: r495509 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/URLBean.java
Author: mrdon
Date: Thu Jan 11 23:50:25 2007
New Revision: 495509
URL: http://svn.apache.org/viewvc?view=rev&rev=495509
Log:
Added returning of object in setter
WW-1628
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/URLBean.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/URLBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/URLBean.java?view=diff&rev=495509&r1=495508&r2=495509
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/URLBean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/URLBean.java
Thu Jan 11 23:50:25 2007
@@ -41,8 +41,9 @@
String page;
-public void setPage(String page) {
+public URLBean setPage(String page) {
this.page = page;
+return this;
}
public void setRequest(HttpServletRequest request) {
