Modified: roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java?view=diff&rev=541369&r1=541368&r2=541369 ============================================================================== --- roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java (original) +++ roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java Thu May 24 10:54:12 2007 @@ -19,9 +19,7 @@ package org.apache.roller.business.hibernate; import java.io.StringBufferInputStream; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; @@ -30,11 +28,7 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.apache.roller.RollerException; -import org.jdom.Attribute; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; -import org.jdom.output.DOMOutputter; +import org.hibernate.cfg.Environment; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -45,13 +39,12 @@ * This class serves as a helper/util class for all of the Hibernate * manager implementations by providing a set of basic persistence methods * that can be easily reused. - * */ public class HibernatePersistenceStrategy { static final long serialVersionUID = 2561090040518169098L; - protected SessionFactory sessionFactory = null; + protected static SessionFactory sessionFactory = null; private static Log log = LogFactory.getLog(HibernatePersistenceStrategy.class); @@ -62,133 +55,25 @@ } }; - - public HibernatePersistenceStrategy() { - } - - /** - * Construct self using Hibernate config resource and optional dialect. - * @param configResouce Classpath-based path to Hibernate config file (e.g. "/hibernate.cgf.xml") - * @parma dialect Classname of Hibernate dialect to be used (overriding any specified in the configResource) + /** + * Persistence strategy configures itself by using Roller properties: + * 'hibernate.configResource' - the resource name of Roller's Hibernate XML configuration file, + * 'hibernate.dialect' - the classname of the Hibernate dialect to be used, + * 'hibernate.connectionProvider - the classname of Roller's connnection provider impl. */ - public HibernatePersistenceStrategy( - String configResource, - String dialect) throws Exception { - - log.info("configResource: " + configResource); - log.info("dialect: " + dialect); - - // read configResource into DOM form - SAXBuilder builder = new SAXBuilder(); - builder.setEntityResolver(noOpEntityResolver); - Document configDoc = builder.build( - getClass().getResourceAsStream(configResource)); - Element root = configDoc.getRootElement(); - Element sessionFactoryElem = root.getChild("session-factory"); - - // remove any existing connection.datasource and dialect properties - List propertyElems = sessionFactoryElem.getChildren("property"); - List removeList = new ArrayList(); - for (Iterator it = propertyElems.iterator(); it.hasNext();) { - Element elem = (Element) it.next(); - if (elem.getAttribute("name") != null - && elem.getAttribute("name").getValue().equals("dialect")) { - removeList.add(elem); - } - } - for (Iterator it = removeList.iterator(); it.hasNext();) { - Element elem = (Element) it.next(); - sessionFactoryElem.removeContent(elem); - } - - // add Roller dialect property - Element prop = new Element("property").setAttribute( - new Attribute("name","dialect")); - prop.addContent(dialect); - sessionFactoryElem.addContent(prop); + public HibernatePersistenceStrategy(String configResource, String dialect, String connectionProvider) { + // Read Hibernate config file specified by Roller config Configuration config = new Configuration(); - DOMOutputter outputter = new DOMOutputter(); - config.configure(outputter.output(configDoc)); - this.sessionFactory = config.buildSessionFactory(); - } - - /** - * Construct self using Hibernate config resource and optional dialect. - * @param configResouce Classpath-based path to Hibernate config file (e.g. "/hibernate.cgf.xml") - * @parma dialect Classname of Hibernate dialect to be used (or null to use one specified in configResource) - */ - public HibernatePersistenceStrategy( - String configResource, - String dialect, - String driverClass, - String connectionURL, - String username, - String password) throws Exception { - - log.info("configResource: " + configResource); - log.info("dialect: " + dialect); - log.info("driverClass: " + driverClass); - log.info("connectionURL: " + connectionURL); - log.info("username: " + username); - - // read configResource into DOM form - SAXBuilder builder = new SAXBuilder(); - builder.setEntityResolver(noOpEntityResolver); - Document configDoc = builder.build( - getClass().getResourceAsStream(configResource)); - Element root = configDoc.getRootElement(); - Element sessionFactoryElem = root.getChild("session-factory"); - - // remove any existing connection.datasource and dialect properties - List propertyElems = sessionFactoryElem.getChildren("property"); - List removeList = new ArrayList(); - for (Iterator it = propertyElems.iterator(); it.hasNext();) { - Element elem = (Element) it.next(); - if (elem.getAttribute("name") != null - && elem.getAttribute("name").getValue().equals("connection.datasource")) { - removeList.add(elem); - } - if (elem.getAttribute("name") != null - && elem.getAttribute("name").getValue().equals("dialect")) { - removeList.add(elem); - } - } - for (Iterator it = removeList.iterator(); it.hasNext();) { - Element elem = (Element) it.next(); - sessionFactoryElem.removeContent(elem); - } - - // add JDBC connection params instead - Element prop = new Element("property").setAttribute( - new Attribute("name","hibernate.connection.driver_class")); - prop.addContent(driverClass); - sessionFactoryElem.addContent(prop); + config.configure(configResource); - prop = new Element("property").setAttribute( - new Attribute("name","hibernate.connection.url")); - prop.addContent(connectionURL); - sessionFactoryElem.addContent(prop); + // Add dialect specified by Roller config and our connection provider + Properties props = new Properties(); + props.put(Environment.DIALECT, dialect); + props.put(Environment.CONNECTION_PROVIDER, connectionProvider); + config.mergeProperties(props); - prop = new Element("property").setAttribute( - new Attribute("name","hibernate.connection.username")); - prop.addContent(username); - sessionFactoryElem.addContent(prop); - - prop = new Element("property").setAttribute( - new Attribute("name","hibernate.connection.password")); - prop.addContent(password); - sessionFactoryElem.addContent(prop); - - prop = new Element("property").setAttribute( - new Attribute("name","dialect")); - prop.addContent(dialect); - sessionFactoryElem.addContent(prop); - - Configuration config = new Configuration(); - DOMOutputter outputter = new DOMOutputter(); - config.configure(outputter.output(configDoc)); - this.sessionFactory = config.buildSessionFactory(); + this.sessionFactory = config.buildSessionFactory(); }
Modified: roller/branches/roller_4.0_newbackend/merges.txt URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/merges.txt?view=diff&rev=541369&r1=541368&r2=541369 ============================================================================== --- roller/branches/roller_4.0_newbackend/merges.txt (original) +++ roller/branches/roller_4.0_newbackend/merges.txt Thu May 24 10:54:12 2007 @@ -3,6 +3,10 @@ Temporary file to track merges from trunk into the roller_4.0_newbackend branch. +May 24, 2007: final merge from trunk before merge back to trunk +svn merge -r 539679:541345 https://svn.apache.org/repos/asf/roller/trunk + + May 18, 2007: merging latest from trunk svn merge -r 539671:539679 https://svn.apache.org/repos/asf/roller/trunk svn merge -r 539636:539671 https://svn.apache.org/repos/asf/roller/trunk Modified: roller/branches/roller_4.0_newbackend/properties.xmlf URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/properties.xmlf?view=diff&rev=541369&r1=541368&r2=541369 ============================================================================== --- roller/branches/roller_4.0_newbackend/properties.xmlf (original) +++ roller/branches/roller_4.0_newbackend/properties.xmlf Thu May 24 10:54:12 2007 @@ -109,10 +109,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> @@ -183,7 +179,6 @@ <path id="base.path"> <fileset refid="base.jars"/> <fileset refid="mail.jars"/> - <fileset refid="commons.jars"/> <fileset refid="roller-core.jars" /> <fileset refid="roller-planet.jars" /> <fileset refid="xmlrpc.jars"/> Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java?view=diff&rev=541369&r1=541368&r2=541369 ============================================================================== --- roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java (original) +++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java Thu May 24 10:54:12 2007 @@ -33,7 +33,7 @@ import org.apache.roller.business.UserManager; import org.apache.roller.business.WeblogManager; import org.apache.roller.business.runnable.ThreadManager; - +import org.apache.roller.business.hibernate.HibernatePersistenceStrategy; /** * A Hibernate specific implementation of the Roller business layer. Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java?view=diff&rev=541369&r1=541368&r2=541369 ============================================================================== --- roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java (original) +++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java Thu May 24 10:54:12 2007 @@ -20,6 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; +import org.apache.roller.business.hibernate.HibernatePersistenceStrategy; import org.apache.roller.config.RollerConfig; import org.apache.roller.planet.business.Planet; Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.java URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.java?view=diff&rev=541369&r1=541368&r2=541369 ============================================================================== --- roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.java (original) +++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.java Thu May 24 10:54:12 2007 @@ -45,6 +45,7 @@ import org.apache.roller.business.themes.ThemeManager; import org.apache.roller.business.WeblogManager; import org.apache.roller.util.UUIDGenerator; +import org.apache.roller.util.I18nUtils; /** * Website has many-to-many association with users. Website has one-to-many and @@ -696,32 +697,17 @@ this.lastModified = other.getLastModified(); } + /** * Parse locale value and instantiate a Locale object, * otherwise return default Locale. * - * @roller.wrapPojoMethod type="simple" * @return Locale */ public Locale getLocaleInstance() { - if (locale != null) { - String[] localeStr = StringUtils.split(locale,"_"); - if (localeStr.length == 1) { - if (localeStr[0] == null) localeStr[0] = ""; - return new Locale(localeStr[0]); - } else if (localeStr.length == 2) { - if (localeStr[0] == null) localeStr[0] = ""; - if (localeStr[1] == null) localeStr[1] = ""; - return new Locale(localeStr[0], localeStr[1]); - } else if (localeStr.length == 3) { - if (localeStr[0] == null) localeStr[0] = ""; - if (localeStr[1] == null) localeStr[1] = ""; - if (localeStr[2] == null) localeStr[2] = ""; - return new Locale(localeStr[0], localeStr[1], localeStr[2]); - } - } - return Locale.getDefault(); + return I18nUtils.toLocale(getLocale()); } + /** * Return TimeZone instance for value of timeZone, Modified: roller/branches/roller_4.0_newbackend/tools/roller-core/roller-core.jar URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/tools/roller-core/roller-core.jar?view=diff&rev=541369&r1=541368&r2=541369 ============================================================================== Binary files - no diff available. Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml?view=diff&rev=541369&r1=541368&r2=541369 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml Thu May 24 10:54:12 2007 @@ -132,20 +132,8 @@ <property name="userCache" ref="userCache"/> </bean> - <!-- Read users from database --> - <bean id="jdbcAuthenticationDao" class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> - <property name="dataSource"> - <bean class="org.springframework.jndi.JndiObjectFactoryBean"> - <property name="jndiName" value="java:comp/env/jdbc/rollerdb"/> - </bean> - </property> - <property name="usersByUsernameQuery"> - <value>SELECT username,passphrase,isenabled FROM rolleruser WHERE username = ?</value> - </property> - <property name="authoritiesByUsernameQuery"> - <value>SELECT username,rolename FROM userrole WHERE username = ?</value> - </property> - </bean> + <!-- Read users from Roller API --> + <bean id="jdbcAuthenticationDao" class="org.apache.roller.ui.core.security.RollerUserDetailsService"/> <bean id="userCache" class="org.acegisecurity.providers.dao.cache.EhCacheBasedUserCache"> <property name="cache"> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml?view=diff&rev=541369&r1=541368&r2=541369 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml Thu May 24 10:54:12 2007 @@ -21,42 +21,42 @@ "http://struts.apache.org/dtds/tiles-config_2_0.dtd";> <tiles-definitions> - <definition name=".tiles-mainmenupage" template="/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp"> - <put name="bannerStatus" value="/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp" /> - <put name="head" value="/WEB-INF/jsps/tiles/struts2/head.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/empty.jsp" /> - <put name="messages" value="/WEB-INF/jsps/tiles/struts2/messages.jsp" /> + <definition name=".tiles-mainmenupage" template="/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp"> + <put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" /> + <put name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" /> + <put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" /> <put name="content" value="${content}" /> - <put name="sidebar" value="/WEB-INF/jsps/tiles/struts2/empty.jsp" /> - <put name="footer" value="/WEB-INF/jsps/tiles/struts2/footer.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/tiles/empty.jsp" /> + <put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" /> </definition> - <definition name=".tiles-tabbedpage" template="/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp"> - <put name="bannerStatus" value="/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp" /> - <put name="head" value="/WEB-INF/jsps/tiles/struts2/head.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/empty.jsp" /> - <put name="menu" value="/WEB-INF/jsps/tiles/struts2/menu.jsp" /> - <put name="messages" value="/WEB-INF/jsps/tiles/struts2/messages.jsp" /> + <definition name=".tiles-tabbedpage" template="/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp"> + <put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" /> + <put name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" /> + <put name="menu" value="/WEB-INF/jsps/tiles/menu.jsp" /> + <put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" /> <put name="content" value="${content}" /> - <put name="sidebar" value="/WEB-INF/jsps/tiles/struts2/empty.jsp" /> - <put name="footer" value="/WEB-INF/jsps/tiles/struts2/footer.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/tiles/empty.jsp" /> + <put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" /> </definition> - <definition name=".tiles-simplepage" template="/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp"> - <put name="banner" value="/WEB-INF/jsps/tiles/struts2/empty.jsp" /> - <put name="bannerStatus" value="/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp" /> - <put name="head" value="/WEB-INF/jsps/tiles/struts2/head.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> - <put name="messages" value="/WEB-INF/jsps/tiles/struts2/messages.jsp" /> + <definition name=".tiles-simplepage" template="/WEB-INF/jsps/tiles/tiles-simplepage.jsp"> + <put name="banner" value="/WEB-INF/jsps/tiles/empty.jsp" /> + <put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" /> + <put name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> + <put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" /> <put name="content" value="${content}" /> - <put name="footer" value="/WEB-INF/jsps/tiles/struts2/footer.jsp" /> + <put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" /> </definition> - <definition name=".tiles-errorpage" template="/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp"> - <put name="head" value="/WEB-INF/jsps/tiles/struts2/head.jsp" /> - <put name="messages" value="/WEB-INF/jsps/tiles/struts2/messages.jsp" /> + <definition name=".tiles-errorpage" template="/WEB-INF/jsps/tiles/tiles-errorpage.jsp"> + <put name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> + <put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" /> <put name="content" value="${content}" /> - <put name="footer" value="/WEB-INF/jsps/tiles/struts2/footer.jsp" /> + <put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" /> </definition> @@ -77,78 +77,78 @@ <!-- core pages (and associates) --> <definition name=".Setup" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/core/struts2/Setup.jsp" /> + <put name="content" value="/WEB-INF/jsps/core/Setup.jsp" /> </definition> <definition name=".Login" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/core/struts2/Login.jsp" /> + <put name="content" value="/WEB-INF/jsps/core/Login.jsp" /> </definition> <definition name=".Register" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/core/struts2/Register.jsp" /> + <put name="content" value="/WEB-INF/jsps/core/Register.jsp" /> </definition> <definition name=".Welcome" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/core/struts2/Welcome.jsp" /> + <put name="content" value="/WEB-INF/jsps/core/Welcome.jsp" /> </definition> <definition name=".Profile" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/core/struts2/Profile.jsp" /> + <put name="content" value="/WEB-INF/jsps/core/Profile.jsp" /> </definition> <definition name=".CreateWeblog" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/core/struts2/CreateWeblog.jsp" /> + <put name="content" value="/WEB-INF/jsps/core/CreateWeblog.jsp" /> </definition> <definition name=".MainMenu" extends=".tiles-mainmenupage" > - <put name="content" value="/WEB-INF/jsps/core/struts2/MainMenu.jsp" /> - <put name="sidebar" value="/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/core/MainMenu.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/core/MainMenuSidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> </definition> <!-- global admin pages (and associates) --> <definition name=".GlobalConfig" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp" /> + <put name="content" value="/WEB-INF/jsps/admin/GlobalConfig.jsp" /> </definition> <definition name=".UserAdmin" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/admin/struts2/UserAdmin.jsp" /> + <put name="content" value="/WEB-INF/jsps/admin/UserAdmin.jsp" /> </definition> <definition name=".CreateUser" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/admin/struts2/CreateUser.jsp" /> + <put name="content" value="/WEB-INF/jsps/admin/CreateUser.jsp" /> </definition> <definition name=".ModifyUser" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/admin/struts2/ModifyUser.jsp" /> + <put name="content" value="/WEB-INF/jsps/admin/ModifyUser.jsp" /> </definition> <definition name=".GlobalCommentManagement" extends=".tiles-tabbedpage" > - <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" /> - <put name="content" value="/WEB-INF/jsps/admin/struts2/GlobalCommentManagement.jsp" /> - <put name="sidebar" value="/WEB-INF/jsps/admin/struts2/GlobalCommentManagementSidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> + <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" /> + <put name="content" value="/WEB-INF/jsps/admin/GlobalCommentManagement.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> </definition> <definition name=".CommonPingTargets" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/admin/struts2/CommonPingTargets.jsp" /> + <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargets.jsp" /> </definition> <definition name=".CommonPingTargetConfirm" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/admin/struts2/CommonPingTargetConfirm.jsp" /> + <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp" /> </definition> <definition name=".CommonPingTargetAdd" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/admin/struts2/CommonPingTargetAdd.jsp" /> + <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp" /> </definition> <definition name=".CommonPingTargetEdit" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/admin/struts2/CommonPingTargetEdit.jsp" /> + <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp" /> </definition> <definition name=".CacheInfo" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/admin/struts2/CacheInfo.jsp" /> + <put name="content" value="/WEB-INF/jsps/admin/CacheInfo.jsp" /> </definition> <definition name=".PlanetSubscriptions" extends=".tiles-tabbedpage" > @@ -166,163 +166,173 @@ <!-- weblog editor pages (and associates) --> <definition name=".EntryAdd" extends=".tiles-tabbedpage" > - <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" /> - <put name="content" value="/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp" /> - <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> + <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/EntryAdd.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/editor/EntrySidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> </definition> <definition name=".EntryEdit" extends=".tiles-tabbedpage" > - <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" /> - <put name="content" value="/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp" /> - <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> + <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/EntryEdit.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/editor/EntrySidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> </definition> <definition name=".EntryRemove" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/EntryRemove.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".Entries" extends=".tiles-tabbedpage" > - <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" /> - <put name="content" value="/WEB-INF/jsps/authoring/struts2/Entries.jsp" /> - <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/EntriesSidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> + <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/Entries.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/editor/EntriesSidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> </definition> <definition name=".Comments" extends=".tiles-tabbedpage" > - <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" /> - <put name="content" value="/WEB-INF/jsps/authoring/struts2/Comments.jsp" /> - <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> + <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/Comments.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/editor/CommentsSidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> </definition> <definition name=".Categories" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/Categories.jsp" /> - <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/CategoriesSidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/Categories.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/editor/CategoriesSidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> </definition> <definition name=".CategoryAdd" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/CategoryAdd.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/CategoryAdd.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".CategoryEdit" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/CategoryEdit.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/CategoryEdit.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".CategoryRemove" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/CategoryRemove.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/CategoryRemove.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".Bookmarks" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/Bookmarks.jsp" /> - <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/BookmarksSidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/Bookmarks.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/editor/BookmarksSidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> </definition> <definition name=".BookmarkAdd" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/BookmarkAdd.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/BookmarkAdd.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".BookmarkEdit" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/BookmarkEdit.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/BookmarkEdit.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".BookmarksImport" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/BookmarksImport.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/BookmarksImport.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".FolderAdd" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/FolderAdd.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/FolderAdd.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".FolderEdit" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/FolderEdit.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/FolderEdit.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".Resources" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/Resources.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/Resources.jsp" /> </definition> <definition name=".Referrers" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/Referrers.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/Referrers.jsp" /> </definition> <!-- weblog admin pages (and associates) --> <definition name=".WeblogConfig" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/WeblogConfig.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/WeblogConfig.jsp" /> </definition> <definition name=".WeblogRemoveConfirm" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/WeblogRemoveConfirm.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".ThemeEdit" extends=".tiles-tabbedpage" > - <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" /> - <put name="content" value="/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp" /> + <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/ThemeEdit.jsp" /> + </definition> + + <definition name=".StylesheetEdit" extends=".tiles-tabbedpage" > + <put name="content" value="/WEB-INF/jsps/editor/StylesheetEdit.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> + </definition> + + <definition name=".StylesheetEditError" extends=".tiles-tabbedpage" > + <put name="content" value="/WEB-INF/jsps/editor/StylesheetEditError.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".Templates" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/Templates.jsp" /> - <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/TemplatesSidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/Templates.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/editor/TemplatesSidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> </definition> <definition name=".TemplateEdit" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/TemplateEdit.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".TemplateRemove" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/TemplateRemove.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/TemplateRemove.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".Members" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/Members.jsp" /> - <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/MembersSidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/Members.jsp" /> + <put name="sidebar" value="/WEB-INF/jsps/editor/MembersSidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> </definition> <definition name=".MembersInvite" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/MembersInvite.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/MembersInvite.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" /> </definition> <definition name=".Pings" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/Pings.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/Pings.jsp" /> </definition> <definition name=".CustomPingTargets" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/CustomPingTargets.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/CustomPingTargets.jsp" /> </definition> <definition name=".CustomPingTargetConfirm" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/CustomPingTargetConfirm.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp" /> </definition> <definition name=".CustomPingTargetAdd" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/CustomPingTargetAdd.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp" /> </definition> <definition name=".CustomPingTargetEdit" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/CustomPingTargetEdit.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp" /> </definition> <definition name=".Maintenance" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/Maintenance.jsp" /> + <put name="content" value="/WEB-INF/jsps/editor/Maintenance.jsp" /> </definition> </tiles-definitions> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/web.xml?view=diff&rev=541369&r1=541368&r2=541369 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/web.xml (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/web.xml Thu May 24 10:54:12 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> @@ -279,12 +253,12 @@ <servlet> <servlet-name>CommentDataServlet</servlet-name> - <servlet-class>org.apache.roller.ui.authoring.ajax.CommentDataServlet</servlet-class> + <servlet-class>org.apache.roller.ui.struts2.ajax.CommentDataServlet</servlet-class> </servlet> <servlet> <servlet-name>UserDataServlet</servlet-name> - <servlet-class>org.apache.roller.ui.authoring.ajax.UserDataServlet</servlet-class> + <servlet-class>org.apache.roller.ui.struts2.ajax.UserDataServlet</servlet-class> </servlet> <servlet> @@ -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 -->
