Author: agilliland
Date: Tue May 22 12:27:29 2007
New Revision: 540708
URL: http://svn.apache.org/viewvc?view=rev&rev=540708
Log:
EOLing of struts1 support ...
* ripped out all struts1 actions & formbeans
* ripped out all struts1 jsps
* ripped out all struts1 configs
* ripped out struts char encoding filter
* ripped out request filter
* ripped out lots of code/config generation stuff (formbeans, struts config,
struts validator)
* modified calendar tag to use a simple resource bundle instead of relying on
struts1
this commit does *most* of the work to remove struts1 from Roller, but not all
of the work. there are still a variety of places in the code which rely on
struts1 in some form or another and need to be cleaned up. the biggest items
being some of the custom jsp tags which can't be removed because they are used
by the weblog rendering code.
Removed:
roller/trunk/src/org/apache/roller/planet/ui/admin/
roller/trunk/src/org/apache/roller/ui/admin/
roller/trunk/src/org/apache/roller/ui/authoring/struts/
roller/trunk/src/org/apache/roller/ui/authoring/tags/DateMacro.java
roller/trunk/src/org/apache/roller/ui/authoring/tags/RssBadgeTag.java
roller/trunk/src/org/apache/roller/ui/core/filters/RequestFilter.java
roller/trunk/src/org/apache/roller/ui/core/filters/StrutsCharEncodingFilter.java
roller/trunk/src/org/apache/roller/ui/core/struts/
roller/trunk/src/org/apache/roller/ui/core/tags/StatusMessageTag.java
roller/trunk/tests/org/apache/roller/ui/ServletTestBase.java
roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java
roller/trunk/tests/org/apache/roller/ui/UITestSuite.java
roller/trunk/tests/org/apache/roller/ui/authoring/
roller/trunk/tests/org/apache/roller/ui/rendering/plugins/
roller/trunk/web/WEB-INF/jsps/403.jsp
roller/trunk/web/WEB-INF/jsps/403Body.jsp
roller/trunk/web/WEB-INF/jsps/404.jsp
roller/trunk/web/WEB-INF/jsps/404Body.jsp
roller/trunk/web/WEB-INF/jsps/admin/CommonPingTargetDeleteOK.jsp
roller/trunk/web/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
roller/trunk/web/WEB-INF/jsps/admin/CommonPingTargets.jsp
roller/trunk/web/WEB-INF/jsps/admin/PlanetConfig.jsp
roller/trunk/web/WEB-INF/jsps/admin/PlanetGroups.jsp
roller/trunk/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
roller/trunk/web/WEB-INF/jsps/admin/UserAdmin.jsp
roller/trunk/web/WEB-INF/jsps/admin/cacheInfo.jsp
roller/trunk/web/WEB-INF/jsps/admin/rollerProperties.jsp
roller/trunk/web/WEB-INF/jsps/authoring/BookmarkForm.jsp
roller/trunk/web/WEB-INF/jsps/authoring/BookmarksForm.jsp
roller/trunk/web/WEB-INF/jsps/authoring/BookmarksSidebar.jsp
roller/trunk/web/WEB-INF/jsps/authoring/CategoriesForm.jsp
roller/trunk/web/WEB-INF/jsps/authoring/CategoriesSidebar.jsp
roller/trunk/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp
roller/trunk/web/WEB-INF/jsps/authoring/CategoryForm.jsp
roller/trunk/web/WEB-INF/jsps/authoring/CommentManagement.jsp
roller/trunk/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp
roller/trunk/web/WEB-INF/jsps/authoring/CustomPingTargetDeleteOK.jsp
roller/trunk/web/WEB-INF/jsps/authoring/CustomPingTargetEdit.jsp
roller/trunk/web/WEB-INF/jsps/authoring/CustomPingTargets.jsp
roller/trunk/web/WEB-INF/jsps/authoring/FolderForm.jsp
roller/trunk/web/WEB-INF/jsps/authoring/Invitations.jsp
roller/trunk/web/WEB-INF/jsps/authoring/InviteMember.jsp
roller/trunk/web/WEB-INF/jsps/authoring/Maintenance.jsp
roller/trunk/web/WEB-INF/jsps/authoring/MemberPermissions.jsp
roller/trunk/web/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp
roller/trunk/web/WEB-INF/jsps/authoring/PingResult.jsp
roller/trunk/web/WEB-INF/jsps/authoring/Pings.jsp
roller/trunk/web/WEB-INF/jsps/authoring/UploadFile.jsp
roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
roller/trunk/web/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp
roller/trunk/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp
roller/trunk/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp
roller/trunk/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp
roller/trunk/web/WEB-INF/jsps/authoring/WebsiteRemove.jsp
roller/trunk/web/WEB-INF/jsps/authoring/bake-weblog.jsp
roller/trunk/web/WEB-INF/jsps/authoring/edit-page.jsp
roller/trunk/web/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp
roller/trunk/web/WEB-INF/jsps/authoring/edit-pages.jsp
roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp
roller/trunk/web/WEB-INF/jsps/authoring/export-entries.jsp
roller/trunk/web/WEB-INF/jsps/authoring/import-entries.jsp
roller/trunk/web/WEB-INF/jsps/authoring/import.jsp
roller/trunk/web/WEB-INF/jsps/authoring/referers.jsp
roller/trunk/web/WEB-INF/jsps/authoring/remove-page.jsp
roller/trunk/web/WEB-INF/jsps/authoring/spellcheck-entry.jsp
roller/trunk/web/WEB-INF/jsps/authoring/theme-editor.jsp
roller/trunk/web/WEB-INF/jsps/core/CreateWebsite.jsp
roller/trunk/web/WEB-INF/jsps/core/UserNew.jsp
roller/trunk/web/WEB-INF/jsps/core/YourProfile.jsp
roller/trunk/web/WEB-INF/jsps/core/YourWebsites.jsp
roller/trunk/web/WEB-INF/jsps/core/YourWebsitesSidebar.jsp
roller/trunk/web/WEB-INF/jsps/core/login.jsp
roller/trunk/web/WEB-INF/jsps/core/planet.jsp
roller/trunk/web/WEB-INF/jsps/core/welcome.jsp
roller/trunk/web/WEB-INF/jsps/denied.jsp
roller/trunk/web/WEB-INF/jsps/error.jsp
roller/trunk/web/WEB-INF/jsps/errorBody.jsp
roller/trunk/web/WEB-INF/jsps/setupBody.jsp
roller/trunk/web/WEB-INF/jsps/taglibs-error.jsp
roller/trunk/web/WEB-INF/jsps/taglibs.jsp
roller/trunk/web/WEB-INF/jsps/tiles/banner.jsp
roller/trunk/web/WEB-INF/jsps/tiles/bannerStatus.jsp
roller/trunk/web/WEB-INF/jsps/tiles/css-nosidebar.jsp
roller/trunk/web/WEB-INF/jsps/tiles/css-sidebar.jsp
roller/trunk/web/WEB-INF/jsps/tiles/empty.jsp
roller/trunk/web/WEB-INF/jsps/tiles/footer.jsp
roller/trunk/web/WEB-INF/jsps/tiles/head.jsp
roller/trunk/web/WEB-INF/jsps/tiles/menu-admin.jsp
roller/trunk/web/WEB-INF/jsps/tiles/menu-editor.jsp
roller/trunk/web/WEB-INF/jsps/tiles/messages.jsp
roller/trunk/web/WEB-INF/jsps/tiles/search.jsp
roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp
roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp
roller/trunk/web/WEB-INF/jsps/tiles/tiles-errorpage.jsp
roller/trunk/web/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
roller/trunk/web/WEB-INF/jsps/tiles/tiles-simplepage.jsp
roller/trunk/web/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
roller/trunk/web/WEB-INF/struts-config.xml
roller/trunk/web/WEB-INF/tiles-defs.xml
roller/trunk/web/WEB-INF/validation.xml
roller/trunk/web/WEB-INF/validator-rules.xml
Modified:
roller/trunk/build.xml
roller/trunk/properties.xmlf
roller/trunk/src/org/apache/roller/pojos/BookmarkData.java
roller/trunk/src/org/apache/roller/pojos/FolderData.java
roller/trunk/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java
roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java
roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java
roller/trunk/src/org/apache/roller/ui/struts2/editor/ThemeEdit.java
roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
roller/trunk/web/WEB-INF/web.xml
Modified: roller/trunk/build.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/build.xml?view=diff&rev=540708&r1=540707&r2=540708
==============================================================================
--- roller/trunk/build.xml (original)
+++ roller/trunk/build.xml Tue May 22 12:27:29 2007
@@ -77,10 +77,10 @@
<!-- ================================================ -->
<!-- Meta targets -->
<!-- ================================================ -->
-<target name="all" depends="generate,stage-webapp" description="Build all">
+<target name="all" depends="stage-webapp" description="Build all">
</target>
-<target name="build" depends="copy-webapp" description="Compile code and copy
files, no code generation">
+<target name="build" depends="stage-webapp" description="Compile code and copy
files">
</target>
<target name="rebuild" depends="clean,all" description="Clean and build all">
@@ -92,12 +92,6 @@
<delete dir="${ro.dist}" />
</target>
-<!-- ********************************************************************* -->
-<!-- XDoclet code generation -->
-<!-- ********************************************************************* -->
-
-<target name="generate" depends="gen-forms" >
-</target>
<!-- ============================================== -->
<!-- generate code/files for the business layer -->
@@ -128,106 +122,13 @@
</target>
-
-<!-- ============================================== -->
-<!-- Generate pojo wrappers -->
-<target name="gen-wrappers" description="XDoclet generate pojo wrappers">
-
- <!-- Define the XDoclet task -->
- <taskdef name="xdoclet" classname="xdoclet.DocletTask"
- classpathref="xdoclet.path" />
-
- <xdoclet destdir="${build.generated.business}">
-
- <packageSubstitution packages="pojos" substituteWith="pojos.wrapper"/>
-
- <fileset dir="${ro.src}">
- <!--
- it may be easier to glob using *Data.java at some point, but
- for now that will generate a lot of unneeded classes.
-
- maybe we can extend the process to only wrap classes that have
- methods tagged with @roller.wrapPojoMethod ??
- -->
- <include name="org/apache/roller/pojos/BookmarkData.java"/>
- <include name="org/apache/roller/pojos/CommentData.java"/>
- <include name="org/apache/roller/pojos/EntryAttributeData.java"/>
- <include name="org/apache/roller/pojos/FolderData.java"/>
- <include name="org/apache/roller/pojos/RefererData.java"/>
- <include name="org/apache/roller/pojos/Template.java"/>
- <include name="org/apache/roller/pojos/UserData.java"/>
- <include name="org/apache/roller/pojos/WeblogEntryData.java"/>
- <include name="org/apache/roller/pojos/WeblogEntryTagData.java"/>
- <include name="org/apache/roller/pojos/WeblogCategoryData.java"/>
- <include
name="org/apache/roller/pojos/SiteTagAggregateData.java"/>
- <include name="org/apache/roller/pojos/WebsiteData.java"/>
- </fileset>
-
- <template
- destinationFile="{0}Wrapper.java"
- templateFile="metadata/xdoclet/pojo_wrapper.xdt"
- subTaskName="Pojo Wrappers" />
- </xdoclet>
-
-</target>
-
-
-<!-- ============================================== -->
-<!-- generate Struts forms -->
-<target name="gen-forms" description="XDoclet generate form beans">
-
- <!-- Define the XDoclet xdoclet task -->
- <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"
- classpathref="xdoclet.path" />
-
- <mkdir dir="${build.generated.web}"/>
-
- <!-- Use EJBDoclet to generate Struts forms -->
- <ejbdoclet destdir="${build.generated}/unused"
excludedtags="@version,@author">
- <fileset dir="${ro.src}"
includes="org/apache/roller/pojos/WeblogTemplate.java" />
- <fileset dir="${ro.src}" includes="org/apache/roller/pojos/*Data.java"
/>
-
- &custom-gen-web;
-
- <!-- Generate Struts forms -->
- <strutsform destdir="${build.generated.web}"
- prefixWithPackageStructure="no"
- templateFile="./metadata/xdoclet/struts_form.xdt">
-
- <!-- into the org.apache.roller.ui.authoring.struts.forms package
-->
- <packageSubstitution packages="pojos"
- substituteWith="ui.authoring.struts.forms"/>
- </strutsform>
-
- <!-- We are not actually generating data objects, but using the
- dataobject subtask allows the strutsform subtask to add nice
- constructors and setData methods to Struts forms -->
- <dataobject destdir="${ro.build}/unused" pattern="{0}" />
-
- </ejbdoclet>
-
- <!-- Change Struts form names from *DataForm.java to *Form.java -->
- <replace
dir="${build.generated.web}/org/apache/roller/ui/authoring/struts/forms"
- token="DataForm" value="Form"/>
- <move
todir="${build.generated.web}/org/apache/roller/ui/authoring/struts/forms">
- <fileset
dir="${build.generated.web}/org/apache/roller/ui/authoring/struts/forms" >
- <include name="*DataForm.java"/>
- <include name="*ConfigForm.java" />
- </fileset>
- <mapper type="glob" from="*DataForm.java" to="*Form.java"/>
- </move>
-
-</target>
-
<!-- ********************************************************************* -->
<!-- Compile and jar Business Tier classes -->
<!-- ********************************************************************* -->
-
-<target name="build-business">
+<target name="build-business" depends="gen-business">
- <mkdir dir="${build.generated.business}"/>
<mkdir dir="${build.compile.business}"/>
<mkdir dir="${build.lib}"/>
@@ -249,7 +150,6 @@
deprecation="${build.deprecation}">
<src path="${ro.src}" />
- <src path="${build.generated.business}"/>
<classpath>
<path refid="business.path"/>
@@ -261,7 +161,6 @@
<copy todir="${build.compile.business}">
<fileset dir="${ro.src}"
excludes="**/*.java, **/*.html, **/*.png, org/apache/roller/ui/**,
org/apache/roller/webservices/**, org/apache/roller/planet/**" />
- <fileset dir="${build.generated.business}" excludes="**/*.java" />
</copy>
<!-- allow for custom build work -->
@@ -288,7 +187,6 @@
includes="org/apache/roller/ui/**, org/apache/roller/webservices/**,
org/apache/roller/planet/**" >
<src path="${ro.src}" />
- <src path="${build.generated.web}"/>
&custom-src-web;
<classpath>
<path refid="presentation.path"/>
@@ -305,8 +203,8 @@
<exclude name="**/*.png"/>
</fileset>
</copy>
-
- &custom-build-web;
+
+ &custom-build-web;
<!-- Jar up web classes -->
<jar jarfile="${build.lib}/roller-web.jar">
@@ -315,6 +213,7 @@
</target>
+
<!-- ============================================== -->
<!-- create distributable components -->
<target name="dist" depends="stage-webapp" description="Create Roller
Weblogger distributables">
@@ -336,20 +235,12 @@
<!-- ********************************************************************* -->
<!-- Stage web application -->
<!-- ********************************************************************* -->
-
-<target name="stage-webapp" depends="gen-business, build-business, build-web,
gen-dbscripts-conditional, copy-webapp" description="Stage webapp, including
jars">
-</target>
-
-<target name="copy-webapp" depends="build-web" description="Stage webapp
without code generation">
+
+<target name="stage-webapp" depends="build-web, gen-dbscripts-conditional"
description="Stage webapp, including jars">
<mkdir dir="${build.webapp}/WEB-INF/lib"/>
<mkdir dir="${build.webapp}/WEB-INF/tlds"/>
- <!-- Copy WEB-INF contents to staging -->
- <copy todir="${build.webapp}/WEB-INF">
- <fileset dir="${tools.struts}/lib" includes="validator-rules.xml"/>
- </copy>
-
<!-- Copy other jars -->
<copy todir="${build.webapp}/WEB-INF/lib">
<fileset dir="${build.lib}" />
@@ -358,7 +249,6 @@
<fileset refid="presentation.jars" />
<fileset refid="hibernate.jar" />
<fileset refid="hibernate.jars" />
- <fileset refid="commons.jars" />
<fileset refid="struts.jars" />
<fileset refid="struts2.jars" />
<fileset refid="spring.jars" />
@@ -472,15 +362,12 @@
windowtitle="Javadocs: Apache Roller - Weblogger ${ro.version}">
<sourcepath>
<pathelement path="./src"/>
- <pathelement path="${ro.build}/generated/business"/>
- <pathelement path="${ro.build}/generated/presentation"/>
</sourcepath>
<packageset dir="src" defaultexcludes="yes">
<include name="org/apache/roller/**" />
</packageset>
<link href="http://java.sun.com/j2se/1.4/docs/api/"/>
<link href="http://java.sun.com/products/servlet/2.3/javadoc/"/>
- <link href="http://jakarta.apache.org/struts/doc-1.0.2/api"/>
</javadoc>
<copy todir="${build.javadoc}">
<fileset dir="${basedir}/src">
Modified: roller/trunk/properties.xmlf
URL:
http://svn.apache.org/viewvc/roller/trunk/properties.xmlf?view=diff&rev=540708&r1=540707&r2=540708
==============================================================================
--- roller/trunk/properties.xmlf (original)
+++ roller/trunk/properties.xmlf Tue May 22 12:27:29 2007
@@ -102,10 +102,6 @@
<include name="taglibs-string.jar"/>
</fileset>
-<fileset id="commons.jars" dir="${tools.struts}/lib">
- <include name="commons-*.jar"/>
-</fileset>
-
<fileset id="commons-httpclient.jar" dir="${ro.tools}/lib">
<include name="commons-httpclient*.jar"/>
</fileset>
@@ -170,7 +166,6 @@
<path id="base.path">
<fileset refid="base.jars"/>
<fileset refid="mail.jars"/>
- <fileset refid="commons.jars"/>
<fileset refid="roller-planet.jars" />
<fileset refid="xmlrpc.jars"/>
</path>
Modified: roller/trunk/src/org/apache/roller/pojos/BookmarkData.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/BookmarkData.java?view=diff&rev=540708&r1=540707&r2=540708
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/BookmarkData.java (original)
+++ roller/trunk/src/org/apache/roller/pojos/BookmarkData.java Tue May 22
12:27:29 2007
@@ -31,10 +31,6 @@
* the your BookmarkManager implementation.</p>
*
* @ejb:bean name="BookmarkData"
- *
- * @struts.form include-all="true"
- * extends="org.apache.struts.validator.ValidatorForm"
- *
* @hibernate.class lazy="true" table="bookmark"
* @hibernate.cache usage="read-write"
*/
Modified: roller/trunk/src/org/apache/roller/pojos/FolderData.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/FolderData.java?view=diff&rev=540708&r1=540707&r2=540708
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/FolderData.java (original)
+++ roller/trunk/src/org/apache/roller/pojos/FolderData.java Tue May 22
12:27:29 2007
@@ -38,11 +38,8 @@
* set of Folders (there is no one root folder) and each Folder may contain
* Folders or Bookmarks. Don't construct one of these yourself, instead use
* the create method in your BookmarkManager implementation.</p>
- *
- * @struts.form include-all="true"
- * extends="org.apache.struts.validator.ValidatorForm"
+ *
* @ejb:bean name="FolderData"
- *
* @hibernate.class lazy="true" table="folder"
* @hibernate.cache usage="read-write"
*/
Modified:
roller/trunk/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java?view=diff&rev=540708&r1=540707&r2=540708
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java
Tue May 22 12:27:29 2007
@@ -20,19 +20,15 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.util.Locale;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.Globals;
+
/**
* Entry point filter for all requests. This filter ensures that the request
@@ -41,9 +37,9 @@
* This filter should normally be first and last in the chain.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Anil Gangolli</a>
- * @web.filter name="CharEncodingFilter"
*/
public class CharEncodingFilter implements Filter {
+
private FilterConfig mFilterConfig = null;
private static Log mLogger =
LogFactory.getFactory().getInstance(CharEncodingFilter.class);
Modified:
roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java?view=diff&rev=540708&r1=540707&r2=540708
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java
Tue May 22 12:27:29 2007
@@ -21,10 +21,6 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.Globals;
-import org.apache.struts.config.ModuleConfig;
-import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.RequestUtils;
import org.apache.roller.ui.core.tags.HybridTag;
import org.apache.roller.util.DateUtil;
@@ -33,13 +29,12 @@
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
+import java.util.ResourceBundle;
import java.util.StringTokenizer;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
-import org.apache.roller.ui.core.RollerContext;
/**
@@ -156,7 +151,7 @@
(HttpServletRequest)pageContext.getRequest();
// get Resource Bundle
- MessageResources resources = getResources(request);
+ ResourceBundle bundle =
ResourceBundle.getBundle("ApplicationResources", mLocale);
// go back to first day in month
cal = model.getCalendar();
@@ -178,7 +173,7 @@
// -------------------------
pw.print("<table cellspacing=\"0\" border=\"0\" ");
pw.print(" summary=\""
- +resources.getMessage(mLocale, "calendar.summary")
+ +bundle.getString("calendar.summary")
+"\" class=\"hCalendarTable"
+mClassSuffix+"\">");
pw.print("<tr>");
@@ -186,13 +181,13 @@
"class=\"hCalendarMonthYearRow"+mClassSuffix+"\">");
if (model.getPrevMonth() != null) {
pw.print("<a href=\"" + model.computePrevMonthUrl()
- + "\" title=\"" + resources.getMessage(mLocale,
"calendar.prev")
+ + "\" title=\"" + bundle.getString("calendar.prev")
+ "\" class=\"hCalendarNavBar\">«</a> ");
}
pw.print( formatTitle.format(day) );
if (model.getNextMonth() != null) {
pw.print(" <a href=\"" + model.computeNextMonthUrl()
- + "\" title=\"" + resources.getMessage(mLocale,
"calendar.next")
+ + "\" title=\"" + bundle.getString("calendar.next")
+ "\" class=\"hCalendarNavBar\">»</a>");
}
pw.print("</td></tr>");
@@ -246,7 +241,7 @@
pw.print("<a href=\""+model.computeTodayMonthUrl()
+"\" class=\"hCalendarNavBar\">"
- +resources.getMessage(mLocale, "calendar.today")
+ +bundle.getString("calendar.today")
+"</a>");
pw.print("</td>");
@@ -317,12 +312,6 @@
pw.print(cal.get(Calendar.DAY_OF_MONTH));
pw.print("</div></td>");
}
- }
- private MessageResources getResources(HttpServletRequest request) {
- ServletContext app = RollerContext.getServletContext();
- ModuleConfig moduleConfig = RequestUtils.getModuleConfig(request, app);
- return (MessageResources)app.getAttribute(Globals.MESSAGES_KEY +
- moduleConfig.getPrefix());
}
/**
Modified:
roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java?view=diff&rev=540708&r1=540707&r2=540708
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java
Tue May 22 12:27:29 2007
@@ -119,8 +119,7 @@
+" and has not been written to stream."
+" File Size: "+getOpmlFile().length()+" bytes. "
+" This is a limitation of this particular "
- +" web application, hard-coded in "
- +" org.apache.struts.webapp.upload.UploadAction";
+ +" web application";
addError("bookmarksImport.error", data);
}
Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/ThemeEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/ThemeEdit.java?view=diff&rev=540708&r1=540707&r2=540708
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/ThemeEdit.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/ThemeEdit.java Tue May
22 12:27:29 2007
@@ -36,7 +36,6 @@
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.ui.struts2.util.UIAction;
import org.apache.roller.util.cache.CacheManager;
-import org.apache.struts.action.ActionMessage;
/**
Modified:
roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java?view=diff&rev=540708&r1=540707&r2=540708
==============================================================================
---
roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
(original)
+++
roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
Tue May 22 12:27:29 2007
@@ -25,9 +25,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,8 +41,8 @@
import org.apache.roller.util.RollerMessages;
import org.apache.roller.util.URLUtilities;
import org.apache.roller.util.Utilities;
-import org.apache.struts.util.RequestUtils;
import org.apache.xmlrpc.XmlRpcException;
+
/**
* Roller XML-RPC Handler for the MetaWeblog API.
Modified: roller/trunk/web/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/web.xml?view=diff&rev=540708&r1=540707&r2=540708
==============================================================================
--- roller/trunk/web/WEB-INF/web.xml (original)
+++ roller/trunk/web/WEB-INF/web.xml Tue May 22 12:27:29 2007
@@ -26,11 +26,6 @@
<param-value>org.acegisecurity.util.FilterChainProxy</param-value>
</init-param>
</filter>
-
- <filter>
- <filter-name>RequestFilter</filter-name>
-
<filter-class>org.apache.roller.ui.core.filters.RequestFilter</filter-class>
- </filter>
<filter>
<filter-name>DebugFilter</filter-name>
@@ -72,11 +67,6 @@
<filter-class>org.apache.roller.ui.core.filters.CharEncodingFilter</filter-class>
</filter>
- <filter>
- <filter-name>StrutsCharEncodingFilter</filter-name>
-
<filter-class>org.apache.roller.ui.core.filters.StrutsCharEncodingFilter</filter-class>
- </filter>
-
<!-- ******************************************
Filter mappings - order IS important here.
@@ -98,14 +88,6 @@
<dispatcher>FORWARD</dispatcher>
</filter-mapping>
- <!-- Ensures character encoding set to UTF-8 and JSTL and Struts locales
are in sync. -->
- <filter-mapping>
- <filter-name>StrutsCharEncodingFilter</filter-name>
- <url-pattern>/roller-ui/*</url-pattern>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- </filter-mapping>
-
<!-- Ip Banning is mapped for comment and trackbacks only.
Note: this filter does nothing if an ip ban list is not configured. -->
<filter-mapping>
@@ -176,14 +158,6 @@
<dispatcher>FORWARD</dispatcher>
</filter-mapping>
- <!-- Do we still need the RequestFilter? -->
- <filter-mapping>
- <filter-name>RequestFilter</filter-name>
- <url-pattern>*.do</url-pattern>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- </filter-mapping>
-
<!-- Context Listeners -->
<listener>
@@ -298,21 +272,6 @@
</servlet>
- <!-- The Struts Servlet -->
- <servlet>
- <servlet-name>action</servlet-name>
- <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
- <init-param>
- <param-name>config</param-name>
- <param-value>/WEB-INF/struts-config.xml</param-value>
- </init-param>
- <init-param>
- <param-name>validate</param-name>
- <param-value>true</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
-
<servlet>
<servlet-name>XmlRpcServlet</servlet-name>
<servlet-class>org.apache.xmlrpc.webserver.XmlRpcServlet</servlet-class>
@@ -324,13 +283,6 @@
<param-value>true</param-value>
</init-param>
</servlet>
-
-
- <!-- Struts1 support -->
- <servlet-mapping>
- <servlet-name>action</servlet-name>
- <url-pattern>*.do</url-pattern>
- </servlet-mapping>
<!-- Rendering Servlets -->
