Author: hermanns
Date: Tue Apr 11 04:34:25 2006
New Revision: 393190
URL: http://svn.apache.org/viewcvs?rev=393190&view=rev
Log:
Refactoring webwork-> struts names for portlet sample app
o adjusting configurations
Added:
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/struts-portlet
- copied, changed from r393165,
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/webwork-portlet
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
(with props)
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
(contents, props changed)
- copied, changed from r393165,
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/webwork-portlet-object.xml
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
- copied, changed from r393165,
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/webwork-portlet.psml
incubator/webwork2/webapps/portlet/src/main/java/struts.properties
(contents, props changed)
- copied, changed from r393165,
incubator/webwork2/webapps/portlet/src/main/java/webwork.properties
Removed:
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/webwork-portlet
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/webwork-portlet-object.xml
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/webwork-portlet.psml
incubator/webwork2/webapps/portlet/src/main/java/webwork.properties
Modified:
incubator/webwork2/webapps/portlet/src/main/etc/exo/web.xml
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/group.xml
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/layout.xml
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/web.xml
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/webwork-portlet-pages.xml
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
incubator/webwork2/webapps/portlet/src/main/etc/liferay3.6.1/web.xml
incubator/webwork2/webapps/portlet/src/main/java/template/xhtml/components/checkbox.vm
incubator/webwork2/webapps/portlet/src/main/java/template/xhtml/components/mytextfield.vm
incubator/webwork2/webapps/portlet/src/main/java/xwork.xml
incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/portlet.xml
incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/readme.txt
incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/web.xml
Modified: incubator/webwork2/webapps/portlet/src/main/etc/exo/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/exo/web.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/src/main/etc/exo/web.xml (original)
+++ incubator/webwork2/webapps/portlet/src/main/etc/exo/web.xml Tue Apr 11
04:34:25 2006
@@ -5,21 +5,21 @@
-->
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
- <display-name>webwork-portlet</display-name>
+ <display-name>struts-portlet</display-name>
<!-- Uncomment/comment this if you need/don't need Spring support -->
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/applicationContext*.xml</param-value>
</context-param>
<filter>
- <filter-name>webwork</filter-name>
+ <filter-name>action2</filter-name>
<filter-class>
org.apache.struts.action2.dispatcher.FilterDispatcher
</filter-class>
</filter>
<filter-mapping>
- <filter-name>webwork</filter-name>
+ <filter-name>action2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
Modified:
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/README-gridsphere.txt?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
(original)
+++
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
Tue Apr 11 04:34:25 2006
@@ -1,2 +1,2 @@
-Put the empty 'webwork-portlet' file in the
$CATALINA_HOME/webapps/gridsphere/WEB-INF/CustomPortal/portlets
+Put the empty 'struts-portlet' file in the
$CATALINA_HOME/webapps/gridsphere/WEB-INF/CustomPortal/portlets
folder of your Gridsphere installation.
Modified: incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/group.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/group.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/group.xml
(original)
+++ incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/group.xml Tue
Apr 11 04:34:25 2006
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlet-group>
- <group-name>WebWorkPortlet</group-name>
- <group-description>WebWorkPortlet Example
Application</group-description>
+ <group-name>StrutsPortlet</group-name>
+ <group-description>StrutsPortlet Example Application</group-description>
<group-visibility>PUBLIC</group-visibility>
<portlet-role-info>
- <portlet-class>webwork-portlet#WebWorkPortlet</portlet-class>
+ <portlet-class>struts-portlet#StrutsPortlet</portlet-class>
<required-role>USER</required-role>
</portlet-role-info>
</portlet-group>
Modified: incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/layout.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/layout.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/layout.xml
(original)
+++ incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/layout.xml Tue
Apr 11 04:34:25 2006
@@ -1,14 +1,14 @@
<portlet-tabbed-pane>
- <portlet-tab label="WebWorkPortlet">
- <title lang="en">WebWorkPortlet Example</title>
+ <portlet-tab label="StrutsPortlet">
+ <title lang="en">StrutsPortlet Example</title>
<portlet-tabbed-pane style="sub-menu">
- <portlet-tab label="webworkportlettab">
- <title lang="en">WebWorkPortlet Example Application</title>
+ <portlet-tab label="strutsportlettab">
+ <title lang="en">StrutsPortlet Example Application</title>
<table-layout>
<row-layout>
<column-layout>
- <portlet-frame label="webworkportlet">
-
<portlet-class>webwork-portlet#WebWorkPortlet</portlet-class>
+ <portlet-frame label="strutsportlet">
+
<portlet-class>struts-portlet#StrutsPortlet</portlet-class>
</portlet-frame>
</column-layout>
</row-layout>
Copied:
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/struts-portlet (from
r393165,
incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/webwork-portlet)
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/struts-portlet?p2=incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/struts-portlet&p1=incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/webwork-portlet&r1=393165&r2=393190&rev=393190&view=diff
==============================================================================
(empty)
Modified: incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/web.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/web.xml
(original)
+++ incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/web.xml Tue Apr
11 04:34:25 2006
@@ -5,21 +5,21 @@
-->
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
- <display-name>webwork-portlet</display-name>
+ <display-name>struts-portlet</display-name>
<!-- Uncomment/comment this if you need/don't need Spring support -->
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/applicationContext*.xml</param-value>
</context-param>
<filter>
- <filter-name>webwork</filter-name>
+ <filter-name>action2</filter-name>
<filter-class>
org.apache.struts.action2.dispatcher.FilterDispatcher
</filter-class>
</filter>
<filter-mapping>
- <filter-name>webwork</filter-name>
+ <filter-name>action2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
@@ -69,7 +69,7 @@
</servlet-mapping>
<servlet-mapping>
<servlet-name>PortletServlet</servlet-name>
- <url-pattern>/jsr/webwork-portlet</url-pattern>
+ <url-pattern>/jsr/struts-portlet</url-pattern>
</servlet-mapping>
<taglib>
Modified:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
(original)
+++
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
Tue Apr 11 04:34:25 2006
@@ -3,5 +3,5 @@
~ Copyright (c) 2002-2006 by OpenSymphony
~ All rights reserved.
-->
- <app-name>webwork-portlet</app-name>
+ <app-name>struts-portlet</app-name>
</jboss-app>
Modified:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
(original)
+++
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
Tue Apr 11 04:34:25 2006
@@ -4,12 +4,12 @@
~ All rights reserved.
-->
<portlet>
- <portlet-name>WebWorkPortlet</portlet-name>
+ <portlet-name>StrutsPortlet</portlet-name>
<security>
</security>
</portlet>
<portlet>
- <portlet-name>WebWorkPortlet2</portlet-name>
+ <portlet-name>StrutsPortlet2</portlet-name>
<security>
</security>
</portlet>
Modified:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
(original)
+++
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
Tue Apr 11 04:34:25 2006
@@ -5,11 +5,11 @@
-->
<instances>
<instance>
- <instance-name>WebWorkPortletInstance</instance-name>
- <component-ref>WebWorkPortlet</component-ref>
+ <instance-name>StrutsPortletInstance</instance-name>
+ <component-ref>StrutsPortlet</component-ref>
</instance>
<instance>
- <instance-name>WebWorkPortlet2Instance</instance-name>
- <component-ref>WebWorkPortlet2</component-ref>
+ <instance-name>StrutsPortlet2Instance</instance-name>
+ <component-ref>StrutsPortlet2</component-ref>
</instance>
</instances>
Added:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml?rev=393190&view=auto
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
(added)
+++
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
Tue Apr 11 04:34:25 2006
@@ -0,0 +1,22 @@
+<pages>
+<!--
+ ~ Copyright (c) 2002-2006 by OpenSymphony
+ ~ All rights reserved.
+ -->
+ <portal-name>default</portal-name>
+ <page>
+ <page-name>struts-portlet</page-name>
+ <window>
+ <window-name>StrutsPortletWindow</window-name>
+
<instance-ref>struts-portlet.StrutsPortlet.StrutsPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>StrutsPortletWindow2</window-name>
+
<instance-ref>struts-portlet.StrutsPortlet2.StrutsPortlet2Instance</instance-ref>
+ <region>right</region>
+ <height>0</height>
+ </window>
+ </page>
+</pages>
Propchange:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/webwork-portlet-pages.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/webwork-portlet-pages.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/webwork-portlet-pages.xml
(original)
+++
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/webwork-portlet-pages.xml
Tue Apr 11 04:34:25 2006
@@ -5,16 +5,16 @@
-->
<portal-name>default</portal-name>
<page>
- <page-name>webwork-portlet</page-name>
+ <page-name>struts-portlet</page-name>
<window>
- <window-name>WebWorkPortletWindow</window-name>
-
<instance-ref>webwork-portlet.WebWorkPortlet.WebWorkPortletInstance</instance-ref>
+ <window-name>StrutsPortletWindow</window-name>
+
<instance-ref>struts-portlet.StrutsPortlet.StrutsPortletInstance</instance-ref>
<region>left</region>
<height>0</height>
</window>
<window>
- <window-name>WebWorkPortletWindow2</window-name>
-
<instance-ref>webwork-portlet.WebWorkPortlet2.WebWorkPortlet2Instance</instance-ref>
+ <window-name>StrutsPortletWindow2</window-name>
+
<instance-ref>struts-portlet.StrutsPortlet2.StrutsPortlet2Instance</instance-ref>
<region>right</region>
<height>0</height>
</window>
Modified:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
(original)
+++
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
Tue Apr 11 04:34:25 2006
@@ -3,5 +3,5 @@
~ Copyright (c) 2002-2006 by OpenSymphony
~ All rights reserved.
-->
- <app-name>webwork-portlet</app-name>
+ <app-name>struts-portlet</app-name>
</jboss-app>
Modified:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
(original)
+++
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
Tue Apr 11 04:34:25 2006
@@ -4,12 +4,12 @@
~ All rights reserved.
-->
<portlet>
- <portlet-name>WebWorkPortlet</portlet-name>
+ <portlet-name>StrutsPortlet</portlet-name>
<security>
</security>
</portlet>
<portlet>
- <portlet-name>WebWorkPortlet2</portlet-name>
+ <portlet-name>StrutsPortlet2</portlet-name>
<security>
</security>
</portlet>
Copied:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
(from r393165,
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/webwork-portlet-object.xml)
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml?p2=incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml&p1=incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/webwork-portlet-object.xml&r1=393165&r2=393190&rev=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/webwork-portlet-object.xml
(original)
+++
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
Tue Apr 11 04:34:25 2006
@@ -9,11 +9,11 @@
<parent-ref>default</parent-ref>
<properties />
<page>
- <page-name>WebWorkPortlet Example</page-name>
+ <page-name>StrutsPortlet Example</page-name>
<properties />
<window>
- <window-name>WebWorkWindow</window-name>
-
<instance-ref>WebWorkPortletInstance</instance-ref>
+ <window-name>StrutsWindow</window-name>
+
<instance-ref>StrutsPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
</window>
@@ -22,8 +22,8 @@
<deployment>
<if-exists>overwrite</if-exists>
<instance>
- <instance-name>WebWorkPortletInstance</instance-name>
-
<component-ref>webwork-portlet.WebWorkPortlet</component-ref>
+ <instance-name>StrutsPortletInstance</instance-name>
+
<component-ref>struts-portlet.StrutsPortlet</component-ref>
</instance>
</deployment>
</deployments>
Propchange:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
(original)
+++
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
Tue Apr 11 04:34:25 2006
@@ -1 +1 @@
-Copy the webwork-portlet.psml file to the
JETSPEED2_INSTALL_DIR/webapps/jetspeed/WEB-INF/pages directory.
+Copy the struts-portlet.psml file to the
JETSPEED2_INSTALL_DIR/webapps/jetspeed/WEB-INF/pages directory.
Copied:
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
(from r393165,
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/webwork-portlet.psml)
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/struts-portlet.psml?p2=incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/struts-portlet.psml&p1=incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/webwork-portlet.psml&r1=393165&r2=393190&rev=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/webwork-portlet.psml
(original)
+++
incubator/webwork2/webapps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
Tue Apr 11 04:34:25 2006
@@ -4,11 +4,11 @@
layout-decorator="tigris"
portlet-decorator="tigris"
/>
- <title>WebWork Portlet Example Application</title>
- <metadata name="title" xml:lang="en">WebWork Portlet Example
Application</metadata>
+ <title>Struts Action 2.0 Portlet Example Application</title>
+ <metadata name="title" xml:lang="en">Struts Action 2.0 Portlet Example
Application</metadata>
<fragment id="simplest" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
- <fragment id="webwork-portlet-1" type="portlet"
name="webwork-portlet::WebWorkPortlet">
+ <fragment id="struts-portlet-1" type="portlet"
name="struts-portlet::StrutsPortlet">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
Modified: incubator/webwork2/webapps/portlet/src/main/etc/liferay3.6.1/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/liferay3.6.1/web.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/src/main/etc/liferay3.6.1/web.xml
(original)
+++ incubator/webwork2/webapps/portlet/src/main/etc/liferay3.6.1/web.xml Tue
Apr 11 04:34:25 2006
@@ -5,24 +5,24 @@
-->
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
- <display-name>webwork-portlet</display-name>
+ <display-name>struts-portlet</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/applicationContext*.xml</param-value>
</context-param>
<context-param>
<param-name>company_id</param-name>
- <param-value>opensymphony.com</param-value>
+ <param-value>struts.apache.org</param-value>
</context-param>
<filter>
- <filter-name>webwork</filter-name>
+ <filter-name>action2</filter-name>
<filter-class>
org.apache.struts.action2.dispatcher.FilterDispatcher
</filter-class>
</filter>
<filter-mapping>
- <filter-name>webwork</filter-name>
+ <filter-name>action2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
@@ -43,7 +43,7 @@
<servlet>
- <servlet-name>WebWorkPortlet</servlet-name>
+ <servlet-name>StrutsPortlet</servlet-name>
<servlet-class>
com.liferay.portal.servlet.PortletServlet
</servlet-class>
@@ -80,8 +80,8 @@
<url-pattern>/dwr/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>WebWorkPortlet</servlet-name>
- <url-pattern>/WebWorkPortlet/*</url-pattern>
+ <servlet-name>StrutsPortlet</servlet-name>
+ <url-pattern>/StrutsPortlet/*</url-pattern>
</servlet-mapping>
<taglib>
<taglib-uri>/cewolf</taglib-uri>
Copied: incubator/webwork2/webapps/portlet/src/main/java/struts.properties
(from r393165,
incubator/webwork2/webapps/portlet/src/main/java/webwork.properties)
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/java/struts.properties?p2=incubator/webwork2/webapps/portlet/src/main/java/struts.properties&p1=incubator/webwork2/webapps/portlet/src/main/java/webwork.properties&r1=393165&r2=393190&rev=393190&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/src/main/java/webwork.properties
(original)
+++ incubator/webwork2/webapps/portlet/src/main/java/struts.properties Tue Apr
11 04:34:25 2006
@@ -1 +1 @@
-webwork.objectFactory = spring
+struts.objectFactory = spring
Propchange: incubator/webwork2/webapps/portlet/src/main/java/struts.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/webwork2/webapps/portlet/src/main/java/template/xhtml/components/checkbox.vm
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/java/template/xhtml/components/checkbox.vm?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/java/template/xhtml/components/checkbox.vm
(original)
+++
incubator/webwork2/webapps/portlet/src/main/java/template/xhtml/components/checkbox.vm
Tue Apr 11 04:34:25 2006
@@ -1,12 +1,12 @@
<div align="center">
<input type="checkbox"
- name="$!webwork.htmlEncode($parameters.name)"
- value="$!webwork.htmlEncode($parameters.fieldValue)"
+ name="$!struts.htmlEncode($parameters.name)"
+ value="$!struts.htmlEncode($parameters.fieldValue)"
#if ($parameters.nameValue) checked="checked" #end
#if ($parameters.disabled == true) disabled="disabled" #end
- #if ($parameters.tabindex)
tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
- #if ($parameters.onchange)
onchange="$!webwork.htmlEncode($parameters.onchange)" #end
- #if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
+ #if ($parameters.tabindex)
tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+ #if ($parameters.onchange)
onchange="$!struts.htmlEncode($parameters.onchange)" #end
+ #if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
/><br />
- $!webwork.htmlEncode($parameters.label)
+ $!struts.htmlEncode($parameters.label)
</div>
Modified:
incubator/webwork2/webapps/portlet/src/main/java/template/xhtml/components/mytextfield.vm
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/java/template/xhtml/components/mytextfield.vm?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/java/template/xhtml/components/mytextfield.vm
(original)
+++
incubator/webwork2/webapps/portlet/src/main/java/template/xhtml/components/mytextfield.vm
Tue Apr 11 04:34:25 2006
@@ -1,15 +1,15 @@
<div align="center">
<input type="text"
- name="$!webwork.htmlEncode($parameters.name)"
- #if ($parameters.size) size="$!webwork.htmlEncode($parameters.size)"
#end
- #if ($parameters.maxlength)
maxlength="$!webwork.htmlEncode($parameters.maxlength)" #end
- #if ($parameters.nameValue)
value="$!webwork.htmlEncode($parameters.nameValue)" #end
+ name="$!struts.htmlEncode($parameters.name)"
+ #if ($parameters.size) size="$!struts.htmlEncode($parameters.size)" #end
+ #if ($parameters.maxlength)
maxlength="$!struts.htmlEncode($parameters.maxlength)" #end
+ #if ($parameters.nameValue)
value="$!struts.htmlEncode($parameters.nameValue)" #end
#if ($parameters.disabled == true) disabled="disabled" #end
#if ($parameters.readonly) readonly="readonly" #end
- #if ($parameters.onkeyup)
onkeyup="$!webwork.htmlEncode($parameters.onkeyup)" #end
- #if ($parameters.tabindex)
tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
- #if ($parameters.onchange)
onchange="$!webwork.htmlEncode($parameters.onchange)" #end
- #if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
+ #if ($parameters.onkeyup)
onkeyup="$!struts.htmlEncode($parameters.onkeyup)" #end
+ #if ($parameters.tabindex)
tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+ #if ($parameters.onchange)
onchange="$!struts.htmlEncode($parameters.onchange)" #end
+ #if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
/><br />
- $!webwork.htmlEncode($parameters.label)
+ $!struts.htmlEncode($parameters.label)
</div>
Modified: incubator/webwork2/webapps/portlet/src/main/java/xwork.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/java/xwork.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/src/main/java/xwork.xml (original)
+++ incubator/webwork2/webapps/portlet/src/main/java/xwork.xml Tue Apr 11
04:34:25 2006
@@ -117,7 +117,7 @@
</package>
- <package name="edit" extends="webwork-portlet-default"
+ <package name="edit" extends="struts-portlet-default"
namespace="/edit">
<action name="index"
class="com.opensymphony.xwork.ActionSupport">
@@ -159,7 +159,7 @@
</action>
</package>
- <package name="help" extends="webwork-portlet-default"
+ <package name="help" extends="struts-portlet-default"
namespace="/help">
<action name="index"
class="com.opensymphony.xwork.ActionSupport">
Modified: incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/portlet.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/portlet.xml
(original)
+++ incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/portlet.xml Tue
Apr 11 04:34:25 2006
@@ -1,10 +1,10 @@
<portlet-app version="1.0"
xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"; id="webwork-portlet">
- <portlet id="WebWorkPortlet">
- <description xml:lang="EN">WebWork2 Test Portlet</description>
- <portlet-name>WebWorkPortlet</portlet-name>
- <display-name xml:lang="EN">WebWork2 Test Portlet</display-name>
+xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"; id="struts-portlet">
+ <portlet id="StrutsPortlet">
+ <description xml:lang="EN">Struts Action 2.0 Test Portlet</description>
+ <portlet-name>StrutsPortlet</portlet-name>
+ <display-name xml:lang="EN">Struts Action 2.0 Test Portlet</display-name>
<portlet-class>org.apache.struts.action2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
@@ -54,14 +54,14 @@
<portlet-info>
<title>My PortletWork portlet</title>
<short-title>PW</short-title>
- <keywords>webwork,portletwork</keywords>
+ <keywords>struts,portletwork</keywords>
</portlet-info>
</portlet>
- <portlet id="WebWorkPortlet2">
- <description xml:lang="EN">WebWork2 Test Portlet2</description>
- <portlet-name>WebWorkPortlet2</portlet-name>
- <display-name xml:lang="EN">WebWork2 Test Portlet2</display-name>
+ <portlet id="StrutsPortlet2">
+ <description xml:lang="EN">Struts Action 2 Test Portlet2</description>
+ <portlet-name>StrutsPortlet2</portlet-name>
+ <display-name xml:lang="EN">Struts Action 2 Test Portlet2</display-name>
<portlet-class>org.apache.struts.action2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
@@ -111,7 +111,7 @@
<portlet-info>
<title>My PortletWork portlet2</title>
<short-title>PW2</short-title>
- <keywords>webwork,portletwork</keywords>
+ <keywords>struts,portletwork</keywords>
</portlet-info>
</portlet>
Modified: incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/readme.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/readme.txt?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/readme.txt
(original)
+++ incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/readme.txt Tue
Apr 11 04:34:25 2006
@@ -6,5 +6,5 @@
jboss-portlet.xml
jboss-web.xml
portlet-instances.xml
-portletwork-example-object.xml
-portletwork-example-pages.xml
+struts-example-object.xml
+struts-example-pages.xml
Modified:
incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
---
incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
(original)
+++
incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
Tue Apr 11 04:34:25 2006
@@ -1,6 +1,6 @@
<%@ taglib prefix="saf" uri="/struts-action" %>
<saf:head theme="ajax"/>
-<link rel="stylesheet" type="text/css" href="<saf:url
value="/webwork/tabs.css"/>">
+<link rel="stylesheet" type="text/css" href="<saf:url
value="/struts/tabs.css"/>">
<b>This is a tabbed pane with two panels that fetches data from a remote
action via ajax</b>
<saf:tabbedPanel id="test2" theme="simple" >
Modified: incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/web.xml?rev=393190&r1=393189&r2=393190&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/web.xml Tue Apr
11 04:34:25 2006
@@ -7,17 +7,18 @@
<param-value>/WEB-INF/applicationContext*.xml</param-value>
</context-param>
<filter id="filterdispatcher">
- <filter-name>webwork</filter-name>
+ <filter-name>action2</filter-name>
<filter-class>
org.apache.struts.action2.dispatcher.FilterDispatcher
</filter-class>
</filter>
<filter-mapping>
- <filter-name>webwork</filter-name>
+ <filter-name>action2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
- <listener>
+
+ <listener>
<listener-class>
org.springframework.web.context.ContextLoaderListener
</listener-class>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
