Author: hermanns
Date: Wed Sep 13 01:42:56 2006
New Revision: 442896
URL: http://svn.apache.org/viewvc?view=rev&rev=442896
Log:
Portlet sample application doesn't work
o additional cleanups from old portletwork code to latest struts impl
o patches applied
o removed empty dirs
Issue Number: WW-1407
Added:
struts/struts2/trunk/apps/portlet/src/main/resources/log4j.xml (contents,
props changed)
- copied, changed from r442551,
struts/struts2/trunk/apps/portlet/src/main/java/log4j.xml
struts/struts2/trunk/apps/portlet/src/main/resources/template/
- copied from r442551,
struts/struts2/trunk/apps/portlet/src/main/java/template/
struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml
(contents, props changed)
- copied, changed from r442551,
struts/struts2/trunk/apps/portlet/src/main/java/validators.xml
struts/struts2/trunk/apps/portlet/src/main/resources/xwork.xml (contents,
props changed)
- copied, changed from r442551,
struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml
Removed:
struts/struts2/trunk/apps/portlet/src/main/java/log4j.xml
struts/struts2/trunk/apps/portlet/src/main/java/template/
struts/struts2/trunk/apps/portlet/src/main/java/validators.xml
struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/border/
struts/struts2/trunk/apps/portlet/src/main/webapp/decorators/
struts/struts2/trunk/apps/portlet/src/main/webapp/edit/
struts/struts2/trunk/apps/portlet/src/main/webapp/help/
struts/struts2/trunk/apps/portlet/src/main/webapp/icons/
struts/struts2/trunk/apps/portlet/src/main/webapp/images/
struts/struts2/trunk/apps/portlet/src/main/webapp/template/
Modified:
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
Copied: struts/struts2/trunk/apps/portlet/src/main/resources/log4j.xml (from
r442551, struts/struts2/trunk/apps/portlet/src/main/java/log4j.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/log4j.xml?view=diff&rev=442896&p1=struts/struts2/trunk/apps/portlet/src/main/java/log4j.xml&r1=442551&p2=struts/struts2/trunk/apps/portlet/src/main/resources/log4j.xml&r2=442896
==============================================================================
(empty)
Propchange: struts/struts2/trunk/apps/portlet/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/portlet/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml
(from r442551, struts/struts2/trunk/apps/portlet/src/main/java/validators.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml?view=diff&rev=442896&p1=struts/struts2/trunk/apps/portlet/src/main/java/validators.xml&r1=442551&p2=struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml&r2=442896
==============================================================================
(empty)
Propchange: struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: struts/struts2/trunk/apps/portlet/src/main/resources/xwork.xml (from
r442551, struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/xwork.xml?view=diff&rev=442896&p1=struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml&r1=442551&p2=struts/struts2/trunk/apps/portlet/src/main/resources/xwork.xml&r2=442896
==============================================================================
(empty)
Propchange: struts/struts2/trunk/apps/portlet/src/main/resources/xwork.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/portlet/src/main/resources/xwork.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp?view=diff&rev=442896&r1=442895&r2=442896
==============================================================================
---
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp
(original)
+++
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp
Wed Sep 13 01:42:56 2006
@@ -1,5 +1,5 @@
-<%@ taglib prefix="pw" uri="/portletwork" %>
-<H1>Portletwork</H1>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<H1>StrutsPortlet</H1>
This is the default edit page!
<p>
-<a href="<pw:url value="prefsForm.action"/>">Set some prefs</a>
+<a href="<s:url value="prefsForm.action"/>">Set some prefs</a>
Modified:
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp?view=diff&rev=442896&r1=442895&r2=442896
==============================================================================
---
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp
(original)
+++
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp
Wed Sep 13 01:42:56 2006
@@ -1,7 +1,6 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="pw" uri="/portletwork" %>
-<pw:form action="prefsFormSave.action" method="POST">
+<s:form action="prefsFormSave.action" method="POST">
<s:textfield label="Preference one" name="preferenceOne"
value="%{preferenceOne}"/>
<s:textfield label="Preference two" name="preferenceTwo"
value="%{preferenceTwo}"/>
<s:submit value="Save prefs"/>
-</pw:form>
+</s:form>
Modified:
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp?view=diff&rev=442896&r1=442895&r2=442896
==============================================================================
---
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp
(original)
+++
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp
Wed Sep 13 01:42:56 2006
@@ -1,5 +1,5 @@
-<%@ taglib prefix="pw" uri="/portletwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
The preferences has been saved.
-<a href="<pw:url value="index.action"/>">Back</a>
+<a href="<s:url value="index.action"/>">Back</a>
Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=442896&r1=442895&r2=442896
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
(original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml Wed
Sep 13 01:42:56 2006
@@ -52,9 +52,9 @@
<supported-locale>en</supported-locale>
<portlet-info>
- <title>My PortletWork portlet</title>
- <short-title>PW</short-title>
- <keywords>struts,portletwork</keywords>
+ <title>My StrutsPortlet portlet</title>
+ <short-title>SP</short-title>
+ <keywords>struts,portlet</keywords>
</portlet-info>
</portlet>
@@ -109,9 +109,9 @@
<supported-locale>en</supported-locale>
<portlet-info>
- <title>My PortletWork portlet2</title>
- <short-title>PW2</short-title>
- <keywords>struts,portletwork</keywords>
+ <title>My StrutsPortlet portlet2</title>
+ <short-title>SP2</short-title>
+ <keywords>struts,portlet</keywords>
</portlet-info>
</portlet>
Modified:
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp?view=diff&rev=442896&r1=442895&r2=442896
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
(original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
Wed Sep 13 01:42:56 2006
@@ -1,7 +1,7 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<H2>Welcome to the Struts example portlet</H2>
<p/>
-Here you'll find examples of what is possible with the PortletWork framework.
+Here you'll find examples of what is possible with the Struts Portlet
integration framework.
<ul>
<li><a href="<s:url action="formExample"/>">A simple form</a></li>
<li><a href="<s:url action="validationExample"/>">Validation</a></li>
