Author: mrdon
Date: Wed Jan 17 13:54:13 2007
New Revision: 497194
URL: http://svn.apache.org/viewvc?view=rev&rev=497194
Log:
Fixed portlet example to work on Liferay (ajax examples still broken)
WW-1650
Removed:
struts/struts2/trunk/apps/portlet/src/main/resources/commons-logging.properties
Modified:
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?view=diff&rev=497194&r1=497193&r2=497194
==============================================================================
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Wed Jan 17 13:54:13 2007
@@ -25,14 +25,39 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
-
- <!--
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-spring-plugin</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-portlet-plugin</artifactId>
+ <artifactId>struts2-core</artifactId>
<version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>velocity-tools</groupId>
+ <artifactId>velocity-tools</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
</dependency>
- -->
+
<dependency>
<groupId>javax.servlet</groupId>
Modified:
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp?view=diff&rev=497194&r1=497193&r2=497194
==============================================================================
---
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
(original)
+++
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
Wed Jan 17 13:54:13 2007
@@ -11,7 +11,7 @@
<s:textfield name="tt2" label="Test Text2" />
</s:form>
</s:div>
- <s:div href="/view/ajaxData.action" id="ryh1" theme="ajax" label="remote
one" />
+ <s:div href="<s:url action="ajaxData"/>" id="ryh1" theme="ajax"
label="remote one" />
<s:div id="middle" label="middle" theme="ajax">
middle tab<br/>
<s:form >
@@ -19,7 +19,7 @@
<s:textfield name="tt2" label="Test Text442" />
</s:form>
</s:div>
- <s:div href="/view/ajaxData.action" id="ryh21" theme="ajax"
label="remote right" />
+ <s:div href="<s:url action="ajaxData"/>" id="ryh21" theme="ajax"
label="remote right" />
</s:tabbedPanel>
<p/>
@@ -28,7 +28,7 @@
id="once"
theme="ajax"
cssStyle="border: 1px solid yellow;"
- href="/view/ajaxData.action"
+ href="<s:url action="ajaxData"/>"
delay="5000"
loadingText="loading...">
Waiting for data</s:div>
@@ -37,10 +37,10 @@
<s:div
id="twoseconds"
cssStyle="border: 1px solid yellow;"
- href="/view/ajaxData.action"
+ href="<s:url action="ajaxData"/>"
theme="ajax"
delay="2000"
- updateInterval="2000"
+ updateFreq="2000"
errorText="There was an error"
loadingText="loading...">Initial Content
</s:div>
Modified:
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm?view=diff&rev=497194&r1=497193&r2=497194
==============================================================================
---
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
(original)
+++
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
Wed Jan 17 13:54:13 2007
@@ -1 +1,4 @@
Hello World from velocity!
+<p />
+#surl ("id=url" "action=index")
+<a href="${url}">Back to the front page</a>
