From 6265c55f3f6d0e3bdcf16104f9c1ce5b6cf6916e Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Wed, 17 Jan 2007 21:54:13 +0000
Subject: [PATCH] Fixed portlet example to work on Liferay (ajax examples still
 broken) WW-1650

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@497194 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/portlet/pom.xml                          | 33 ++++++++++++++++---
 .../main/resources/commons-logging.properties |  2 --
 .../main/webapp/WEB-INF/view/ajaxExample.jsp  | 10 +++---
 .../main/webapp/WEB-INF/view/helloWorld.vm    |  3 ++
 4 files changed, 37 insertions(+), 11 deletions(-)
 delete mode 100644 apps/portlet/src/main/resources/commons-logging.properties

diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index c2c7a6aa5..8c254fc93 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -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>
diff --git a/apps/portlet/src/main/resources/commons-logging.properties b/apps/portlet/src/main/resources/commons-logging.properties
deleted file mode 100644
index a9eceaf5f..000000000
--- a/apps/portlet/src/main/resources/commons-logging.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JCategoryLog
diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
index ad6c48fd7..79ed4aa21 100644
--- a/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
+++ b/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
@@ -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 @@ A DIV that waits for 5 seconds before loading the contents
         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 @@ A DIV that is updated every 2 seconds
 <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>
diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm b/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
index b2933c41b..5007bf76a 100644
--- a/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
+++ b/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
@@ -1 +1,4 @@
 Hello World from velocity!
+<p />
+#surl ("id=url" "action=index")
+<a href="${url}">Back to the front page</a>