Author: hermanns
Date: Wed Dec 6 12:09:04 2006
New Revision: 483207
URL: http://svn.apache.org/viewvc?view=rev&rev=483207
Log:
URL tag: webapp root repeats when path saved to local variable
o fixed samples in showcase: replaced static hrefs attribute values with ids
from url tag
o some tag fixed (removed duplicate theme attributes)
o fixed minor html errors
Issue Number: WW-1537
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp
Wed Dec 6 12:09:04 2006
@@ -11,16 +11,17 @@
<body>
+<s:url id="jsonList" value="/JSONList.action" />
Using a JSON list returned from an action (href="/JSONList.action"), without
autoComplete (autoComplete="false")
<br/>
-<s:autocompleter theme="ajax" href="/JSONList.action" cssStyle="width: 200px;"
autoComplete="false"/>
+<s:autocompleter theme="ajax" href="%{jsonList}" cssStyle="width: 200px;"
autoComplete="false"/>
<br/>
<br/>
Using a JSON list returned from an action (href="/JSONList.action"), with
autoComplete (autoComplete="true")
<br/>
-<s:autocompleter theme="ajax" href="/JSONList.action" cssStyle="width: 200px;"
autoComplete="true" />
+<s:autocompleter theme="ajax" href="%{jsonList}" cssStyle="width: 200px;"
autoComplete="true" />
<br/>
<br/>
@@ -34,33 +35,34 @@
Force valid options (forceValidOption="true")
<br/>
-<s:autocompleter theme="ajax" href="/JSONList.action" cssStyle="width: 200px;"
forceValidOption="true"/>
+<s:autocompleter theme="ajax" href="%{jsonList}" cssStyle="width: 200px;"
forceValidOption="true"/>
<br/>
<br/>
Make dropdown's height to 180px (dropdownHeight="180")
<br/>
-<s:autocompleter theme="ajax" href="/JSONList.action" cssStyle="width: 200px;"
dropdownHeight="180"/>
+<s:autocompleter theme="ajax" href="%{jsonList}" cssStyle="width: 200px;"
dropdownHeight="180"/>
<br/>
<br/>
Disabled combobox (disabled="true")
<br/>
-<s:autocompleter theme="ajax" href="/JSONList.action" cssStyle="width: 200px;"
disabled="true"/>
+<s:autocompleter theme="ajax" href="%{jsonList}" cssStyle="width: 200px;"
disabled="true"/>
<br/>
<br/>
+<s:url id="autoex" value="/nodecorate/AutocompleterExample.action"/>
Link two autocompleter elements. When the selected value in 'Autocompleter 1'
changes, the available values in 'Autocompleter 2' will change also.
<br/>
<form id="selectForm">
<p>Autocompleter 1 <s:autocompleter theme="simple" name="select"
list="{'fruits','colors'}" value="colors"
onValueChangedPublishTopic="/Refresh" forceValidOption="true"/></p>
</form>
-Autocompleter 2 <s:autocompleter theme="ajax"
href="/nodecorate/AutocompleterExample.action" autoComplete="false"
formId="selectForm" refreshListenTopic="/Refresh" forceValidOption="true"/>
+Autocompleter 2 <s:autocompleter theme="ajax" href="%{autoex}"
autoComplete="false" formId="selectForm" refreshListenTopic="/Refresh"
forceValidOption="true"/>
<br/>
<br/>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
Wed Dec 6 12:09:04 2006
@@ -19,17 +19,18 @@
<body>
<div id="t1">Div 1</div>
+<s:url id="ajaxTest" value="/AjaxTest.action" />
<br/><br/>
A submit button
-<s:submit type="submit" theme="ajax" value="submit" targets="t1"
href="/AjaxTest.action"/>
+<s:submit type="submit" theme="ajax" value="submit" targets="t1"
href="%{ajaxTest}"/>
<br/><br/>
Use an image as submit
-<s:submit type="image" theme="ajax" label="Alt Text" targets="t1"
src="${pageContext.request.contextPath}/images/struts-power.gif"
href="/AjaxTest.action"/>
+<s:submit type="image" theme="ajax" label="Alt Text" targets="t1"
src="${pageContext.request.contextPath}/images/struts-power.gif"
href="%{ajaxTest}"/>
<br/><br/>
<label for="textInput">Text to be echoed</label>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
Wed Dec 6 12:09:04 2006
@@ -7,13 +7,15 @@
<jsp:include page="/ajax/commonInclude.jsp"/>
</head>
+<s:url id="ajaxTest" value="/AjaxTest.action" />
+
<body>
<s:div
id="once"
theme="ajax"
cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action">
+ href="%{ajaxTest}">
Initial Content</s:div>
<s:include value="../footer.jsp"/>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
Wed Dec 6 12:09:04 2006
@@ -14,12 +14,14 @@
}
</script>
+<s:url id="ajaxTest" value="/AjaxTest.action" />
+
<body>
<s:div
id="once"
theme="ajax"
cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
+ href="%{ajaxTest}"
handler="handler">
Initial Content</s:div>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
Wed Dec 6 12:09:04 2006
@@ -9,12 +9,14 @@
<body>
+<s:url id="ajaxTest" value="/AjaxTest.action" />
+
<s:div
id="once"
theme="ajax"
cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
+ href="%{ajaxTest}"
updateInterval="2000"
>
Initial Content</s:div>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
Wed Dec 6 12:09:04 2006
@@ -9,10 +9,13 @@
<body>
+<s:url id="ajaxTest" value="/AjaxTest.action" />
+
+
<s:div
id="twoseconds"
cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
+ href="%{ajaxTest}"
theme="ajax"
delay="2000"
updateInterval="%{#parameters.period}"
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
Wed Dec 6 12:09:04 2006
@@ -9,10 +9,12 @@
<body>
+<s:url id="ajaxTest" value="/AjaxTest.action" />
+
<s:div
id="fiveseconds"
cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
+ href="%{ajaxTest}"
theme="ajax"
delay="1000"
updateInterval="5000"
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
Wed Dec 6 12:09:04 2006
@@ -9,6 +9,8 @@
<body>
+<s:url id="ajaxNoUrl" value="/AjaxNoUrl.jsp" />
+
<s:div
id="error"
cssStyle="border: 1px solid yellow;"
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
Wed Dec 6 12:09:04 2006
@@ -9,10 +9,13 @@
<body>
+<s:url id="test3" value="/Test3.action" />
+
+
<s:div
id="error"
cssStyle="border: 1px solid yellow;"
- href="/Test3.action"
+ href="%{test3}"
theme="ajax"
delay="1000"
executeScripts="true"
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
Wed Dec 6 12:09:04 2006
@@ -23,7 +23,7 @@
</script>
<form id="form">
- <label for="textInput"">Text to be echoed</label>
+ <label for="textInput">Text to be echoed</label>
<input type=textbox id="textInput" name="data">
</form>
@@ -33,11 +33,13 @@
<input type=button value="start timer" onclick="controller.start()">
<input type=button value="stop timer" onclick="controller.stop()">
+<s:url id="ajaxTest" value="/AjaxTest.action" />
+
<s:div
id="once"
theme="ajax"
cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
+ href="%{ajaxTest}"
loadingText="Loading..."
refreshListenTopic="/refresh"
startTimerListenTopic="/startTimer"
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp
Wed Dec 6 12:09:04 2006
@@ -26,11 +26,13 @@
<input type=button value="start timer" onclick="controller.start()">
<input type=button value="stop timer" onclick="controller.stop()">
+<s:url id="ajaxTest" value="/AjaxTest.action" />
+
<s:div
id="once"
theme="ajax"
cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
+ href="%{ajaxTest}"
refreshListenTopic="/refresh"
startTimerListenTopic="/startTimer"
stopTimerListenTopic="/stopTimer"
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
Wed Dec 6 12:09:04 2006
@@ -26,9 +26,12 @@
<br/><br/>
+<s:url id="ajaxTest" value="/AjaxTest.action" />
+<s:url id="test3" value="/Test3.action" />
+
<s:a id="link1"
theme="ajax"
- href="/AjaxTest.action"
+ href="%{ajaxTest}"
targets="t1,t2">Update 'Div 1' and 'Div 2'</s:a>
<br/><br/>
@@ -43,7 +46,7 @@
<s:a id="link3"
theme="ajax"
- href="/AjaxTest.action"
+ href="%{ajaxTest}"
loadingText="Loading!!!"
beforeLoading="before()"
afterLoading="after()"
@@ -53,7 +56,7 @@
<s:a id="link4"
theme="ajax"
- href="/Test3.action"
+ href="%{test3}"
executeScripts="true"
targets="t2">Update 'Div 2' and execute returned javascript
</s:a>
@@ -61,7 +64,7 @@
<s:a id="link5"
theme="ajax"
- href="/AjaxTest.action"
+ href="%{ajaxTest}"
handler="handler"
targets="t2">Update 'Div 2' using a custom handler </s:a>
@@ -78,7 +81,7 @@
<s:a id="link6"
theme="ajax"
- href="/AjaxTest.action"
+ href="%{ajaxTest}"
targets="t2"
formId="form"
>Update 'Div 2' with the content of the textbox </s:a>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
Wed Dec 6 12:09:04 2006
@@ -22,6 +22,8 @@
</script>
</head>
+<s:url id="ajaxTest" value="/AjaxTest.action" />
+
<body>
<table cellpadding="0" cellspacing="10" border="0" width="600">
@@ -52,7 +54,7 @@
<s:textfield name="tt2" label="Test Text2"/>
</s:form>
</s:div>
- <s:div href="/AjaxTest.action" id="ryh1" theme="ajax"
+ <s:div href="%{ajaxTest}" id="ryh1" theme="ajax"
label="remote one"></s:div>
<s:div id="middle" label="middle" theme="ajax">
middle tab<br/>
@@ -61,18 +63,18 @@
<s:textfield name="tt2" label="Test Text442"/>
</s:form>
</s:div>
- <s:div href="/AjaxTest.action" id="ryh21" theme="ajax"
label="remote right"/>
+ <s:div href="%{ajaxTest}" id="ryh21" theme="ajax"
label="remote right"/>
</s:tabbedPanel>
</td>
</tr>
<tr>
<td align="top">
<s:tabbedPanel id="testremote">
- <s:div href="/AjaxTest.action" id="r1" theme="ajax"
label="remote one" theme="ajax">
+ <s:div href="%{ajaxTest}" id="r1" theme="ajax"
label="remote one">
<s:action name="AjaxTest" executeResult="true" />
</s:div>
- <s:div href="/AjaxTest.action" id="r2" theme="ajax"
label="remote two" theme="ajax"></s:div>
- <s:div href="/AjaxTest.action" id="r3" theme="ajax"
label="remote three" theme="ajax"></s:div>
+ <s:div href="%{ajaxTest}" id="r2" theme="ajax"
label="remote two"></s:div>
+ <s:div href="%{ajaxTest}" id="r3" theme="ajax"
label="remote three"></s:div>
</s:tabbedPanel>
</td>
<td align="top">
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
Wed Dec 6 12:09:04 2006
@@ -22,6 +22,8 @@
</script>
</head>
+<s:url id="ajaxTest" value="/AjaxTest.action" />
+
<body>
<table cellpadding="0" cellspacing="10" border="0" width="600">
@@ -36,7 +38,7 @@
<s:textfield name="tt2" label="Test Text2" />
</s:form>
</s:div>
- <s:div theme="ajax" href="/AjaxTest.action" id="ryh1"
theme="ajax" label="remote one" />
+ <s:div theme="ajax" href="%{ajaxTest}" id="ryh1"
label="remote one" />
<s:div theme="ajax" id="middle" label="middle">
middle tab<br/>
<s:form >
@@ -44,7 +46,7 @@
<s:textfield name="tt2" label="Test Text442" />
</s:form>
</s:div>
- <s:div theme="ajax" href="/AjaxTest.action" id="ryh21"
theme="ajax" label="remote right" />
+ <s:div theme="ajax" href="%{ajaxTest}" id="ryh21"
label="remote right" />
</s:tabbedPanel>
<!--// END SNIPPET: tabbedpanel-tag-->
</td>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
Wed Dec 6 12:09:04 2006
@@ -7,9 +7,9 @@
<link rel="stylesheet" type="text/css" href="<s:url
value="/struts/tabs.css"/>" />
</head>
<body>
- <s:url id="panel1url" action="panel1" namespace="/nodecorate"
includeContext="false" />
- <s:url id="panel2url" action="panel2" namespace="/nodecorate"
includeContext="false"/>
- <s:url id="panel3url" action="panel3" namespace="/nodecorate"
includeContext="false"/>
+ <s:url id="panel1url" action="panel1" namespace="/nodecorate" />
+ <s:url id="panel2url" action="panel2" namespace="/nodecorate" />
+ <s:url id="panel3url" action="panel3" namespace="/nodecorate" />
<s:tabbedPanel id="tabbedpanel" >
<s:div id="panel1" label="Panel1" href="%{#panel1url}"
theme="ajax" />
<s:div id="panel2" label="Panel2" href="%{#panel2url}"
theme="ajax" />
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java?view=diff&rev=483207&r1=483206&r2=483207
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
Wed Dec 6 12:09:04 2006
@@ -20,8 +20,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts2.views.util.UrlHelper;
-
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -49,7 +47,7 @@
super.evaluateExtraParams();
if (href != null)
- addParameter("href", UrlHelper.buildUrl(findString(href), request,
response, null));
+ addParameter("href", findString(href));
if (errorText != null)
addParameter("errorText", findString(errorText));
if (loadingText != null)
