Author: ajaquith
Date: Sun Feb 7 16:45:58 2010
New Revision: 907444
URL: http://svn.apache.org/viewvc?rev=907444&view=rev
Log:
Replaced the last few wiki:include tags with jsp:include, and deprecated
WikiIncludeTag.
Modified:
incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Header.jsp
Modified: incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp?rev=907444&r1=907443&r2=907444&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp Sun Feb 7 16:45:58
2010
@@ -18,10 +18,10 @@
specific language governing permissions and limitations
under the License.
--%>
-<%@ page import="org.apache.wiki.WikiContext" %>
-<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
+<%@ page import="org.apache.wiki.WikiContext" %>
+<%@ page errorPage="/Error.jsp" %>
<s:useActionBean beanclass="org.apache.wiki.action.AdminActionBean"
event="view" id="admin" executeResolution="true" />
<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
@@ -32,7 +32,7 @@
<wiki:TabbedSection defaultTab="${param['tab']}">
<wiki:Tab id="users" title="Users">
- <wiki:Include page="admin/UserManagement.jsp" />
+ <jsp:include page="admin/UserManagement.jsp" />
</wiki:Tab>
<wiki:Tab id="groups" title="Groups">
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp?rev=907444&r1=907443&r2=907444&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
Sun Feb 7 16:45:58 2010
@@ -113,9 +113,6 @@
<%--
JavaScript
-
- <script
src="http://ajax.googleapis.com/ajax/libs/mootools/1.2.3/mootools.js";></script>
- <script
src="http://ajax.googleapis.com/ajax/libs/mootools/1.2.3/mootools-yui-compressed.js";></script>
--%>
<script type="text/javascript" src="<wiki:Link format='url'
jsp='scripts/mootools-core.js' />"></script>
<script type="text/javascript" src="<wiki:Link format='url'
jsp='scripts/mootools-more.js' />"></script>
@@ -164,7 +161,7 @@
--%>
<wiki:FeedDiscovery/>
- <wiki:Include page="${templates['layout/LocalHeader.jsp']}" />
+ <jsp:include page="${templates['layout/LocalHeader.jsp']}" />
</head>
@@ -173,19 +170,19 @@
<div id="wikibody" class="${prefs.Orientation}">
- <wiki:Include page="${templates['layout/Header.jsp']}" />
+ <jsp:include page="${templates['layout/Header.jsp']}" />
<div id="content">
<div id="page">
- <wiki:Include page="${templates['layout/PageActionsTop.jsp']}" />
+ <jsp:include page="${templates['layout/PageActionsTop.jsp']}" />
<s:layout-component name="content" />
- <wiki:Include page="${templates['layout/PageActionsBottom.jsp']}" />
+ <jsp:include page="${templates['layout/PageActionsBottom.jsp']}" />
</div>
- <wiki:Include page="${templates['layout/Favorites.jsp']}" />
+ <jsp:include page="${templates['layout/Favorites.jsp']}" />
<div class="clearbox"></div>
</div>
- <wiki:Include page="${templates['layout/Footer.jsp']}" />
+ <jsp:include page="${templates['layout/Footer.jsp']}" />
</div>
</body>
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Header.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Header.jsp?rev=907444&r1=907443&r2=907444&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Header.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Header.jsp
Sun Feb 7 16:45:58 2010
@@ -33,11 +33,13 @@
<div class="companylogo"></div>
- <wiki:Include page="${templates['layout/UserBox.jsp']}" />
+ <jsp:include page="${templates['layout/UserBox.jsp']}" />
<div class="pagename"><wiki:PageName/></div>
- <div class="searchbox"><wiki:Include
page="${templates['layout/SearchBox.jsp']}" /></div>
+ <div class="searchbox">
+ <jsp:include page="${templates['layout/SearchBox.jsp']}" />
+ </div>
<div class="breadcrumbs"><fmt:message key="header.yourtrail"
/><wiki:Breadcrumbs/></div>
