You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/06/08 04:33:40 UTC
svn commit: r545374 - in /roller/branches/roller_guice: ./
apps/planet/src/java/org/apache/roller/planet/business/hibernate/
apps/planet/src/java/org/apache/roller/planet/business/jpa/
apps/weblogger/src/java/org/apache/roller/weblogger/business/themes...
Author: snoopdave
Date: Thu Jun 7 19:33:38 2007
New Revision: 545374
URL: http://svn.apache.org/viewvc?view=rev&rev=545374
Log:
Merging latest from trunk
Added:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/StrutsRedirectServlet.java
- copied unchanged from r545007, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/StrutsRedirectServlet.java
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/RegisterDisabled.jsp
- copied unchanged from r545007, roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/RegisterDisabled.jsp
Modified:
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernateConnectionProvider.java
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/PlanetModule.java
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEditError.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/web.xml
roller/branches/roller_guice/apps/weblogger/web/roller-ui/styles/roller.css
roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/Weblog.vm
roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml
roller/branches/roller_guice/apps/weblogger/web/themes/sotto/Weblog.vm
roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml
roller/branches/roller_guice/merges.txt
roller/branches/roller_guice/tools/roller-core/roller-core.jar
roller/branches/roller_guice/tools/roller-planet/roller-planet-business.jar
Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernateConnectionProvider.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernateConnectionProvider.java?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernateConnectionProvider.java (original)
+++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernateConnectionProvider.java Thu Jun 7 19:33:38 2007
@@ -5,13 +5,13 @@
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.DatabaseProvider;
import org.apache.roller.planet.business.PlanetFactory;
+import org.apache.roller.util.DatabaseProvider;
import org.hibernate.HibernateException;
import org.hibernate.connection.ConnectionProvider;
/**
- * Allows use to provide Hibernate with database connections via Roller's
+ * Allows user to provide Hibernate with database connections via Roller's
* DatabaseProvider class. By default HibernatePersistenceStrategy adds this
* class to Hibernate's configuration. If you'd like to provide your own
* ConnctionProvider implementation you can do so by overriding Roller's
Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/PlanetModule.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/PlanetModule.java?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/PlanetModule.java (original)
+++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/PlanetModule.java Thu Jun 7 19:33:38 2007
@@ -20,11 +20,11 @@
import com.google.inject.Binder;
import com.google.inject.Module;
-import org.apache.roller.planet.business.DatabaseProvider;
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.PlanetDatabaseProvider;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.business.PropertiesManager;
+import org.apache.roller.util.DatabaseProvider;
/**
Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java (original)
+++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java Thu Jun 7 19:33:38 2007
@@ -18,16 +18,12 @@
package org.apache.roller.planet.business.jpa;
-import java.util.Enumeration;
-import java.util.Properties;
-import org.apache.roller.planet.business.DatabaseProvider;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.planet.PlanetException;
import org.apache.roller.planet.business.URLStrategy;
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.planet.business.jpa.JPAPersistenceStrategy;
import org.apache.roller.planet.business.FeedFetcher;
import org.apache.roller.planet.business.PropertiesManager;
import org.apache.roller.planet.config.PlanetConfig;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java Thu Jun 7 19:33:38 2007
@@ -22,6 +22,8 @@
import java.io.InputStream;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -57,6 +59,11 @@
theme.setName(root.getChildText("name"));
theme.setAuthor(root.getChildText("author"));
+ // if either id or name is null then throw a parsing exception
+ if(StringUtils.isEmpty(theme.getId()) || StringUtils.isEmpty(theme.getName())) {
+ throw new ThemeParsingException("'id' and 'name' are required theme elements");
+ }
+
// now grab the preview image path
Element previewImage = root.getChild("preview-image");
if(previewImage != null) {
@@ -80,21 +87,31 @@
}
// now grab the templates
+ boolean weblogActionTemplate = false;
List templates = root.getChildren("template");
Iterator templatesIter = templates.iterator();
while (templatesIter.hasNext()) {
Element template = (Element) templatesIter.next();
- theme.addTemplate(this.elementToTemplateMetadata(template));
+ ThemeMetadataTemplate tmpl = elementToTemplateMetadata(template);
+ theme.addTemplate(tmpl);
+
+ if(WeblogTemplate.ACTION_WEBLOG.equals(tmpl.getAction())) {
+ weblogActionTemplate = true;
+ }
}
- // TODO: validation
// make sure all required elements are present and values are valid
+ // check that there is a template with action='weblog'
+ if(!weblogActionTemplate) {
+ throw new ThemeParsingException("did not find a template of action = 'weblog'");
+ }
return theme;
}
- private ThemeMetadataTemplate elementToTemplateMetadata(Element element) {
+ private ThemeMetadataTemplate elementToTemplateMetadata(Element element)
+ throws ThemeParsingException {
ThemeMetadataTemplate template = new ThemeMetadataTemplate();
@@ -114,6 +131,17 @@
String hidden = element.getChildText("hidden");
if("true".equalsIgnoreCase(hidden)) {
template.setHidden(true);
+ }
+
+ // validate template
+ if(StringUtils.isEmpty(template.getAction())) {
+ throw new ThemeParsingException("templates must contain an 'action' attribute");
+ }
+ if(StringUtils.isEmpty(template.getName())) {
+ throw new ThemeParsingException("templates must contain a 'name' element");
+ }
+ if(StringUtils.isEmpty(template.getTemplateLanguage())) {
+ throw new ThemeParsingException("templates must contain a 'templateLanguage' element");
}
return template;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java Thu Jun 7 19:33:38 2007
@@ -85,6 +85,8 @@
mgr.savePage(stylesheet);
RollerFactory.getRoller().flush();
+
+ setTemplate(stylesheet);
}
} catch (WebloggerException ex) {
log.error("Error finding/adding stylesheet tempalate from weblog - "+getActionWeblog().getHandle(), ex);
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Thu Jun 7 19:33:38 2007
@@ -42,7 +42,7 @@
private static Log log = LogFactory.getLog(Templates.class);
// list of templates to display
- private List templates = Collections.EMPTY_LIST;
+ private List<WeblogTemplate> templates = Collections.EMPTY_LIST;
// list of template action types user is allowed to create
private List availableActions = Collections.EMPTY_LIST;
@@ -69,7 +69,14 @@
// query for templates list
try {
UserManager mgr = RollerFactory.getRoller().getUserManager();
- setTemplates(mgr.getPages(getActionWeblog()));
+
+ // get current list of templates, minus custom stylesheet
+ List<WeblogTemplate> pages = mgr.getPages(getActionWeblog());
+ if(getActionWeblog().getTheme().getCustomStylesheet() != null) {
+ pages.remove(mgr.getPageByLink(getActionWeblog(),
+ getActionWeblog().getTheme().getCustomStylesheet()));
+ }
+ setTemplates(pages);
// build list of action types that may be added
List availableActions = new ArrayList();
@@ -83,8 +90,7 @@
availableActions.add(WeblogTemplate.ACTION_WEBLOG);
availableActions.add(WeblogTemplate.ACTION_TAGSINDEX);
- List<WeblogTemplate> pages = getTemplates();
- for(WeblogTemplate tmpPage : pages) {
+ for(WeblogTemplate tmpPage : getTemplates()) {
if(!WeblogTemplate.ACTION_CUSTOM.equals(tmpPage.getAction())) {
availableActions.remove(tmpPage.getAction());
}
@@ -186,11 +192,11 @@
}
- public List getTemplates() {
+ public List<WeblogTemplate> getTemplates() {
return templates;
}
- public void setTemplates(List templates) {
+ public void setTemplates(List<WeblogTemplate> templates) {
this.templates = templates;
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java Thu Jun 7 19:33:38 2007
@@ -33,6 +33,7 @@
import org.apache.roller.weblogger.pojos.Theme;
import org.apache.roller.weblogger.pojos.WeblogTheme;
import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -84,6 +85,7 @@
setThemeId(null);
} else {
setThemeId(getActionWeblog().getTheme().getId());
+ setImportThemeId(getActionWeblog().getTheme().getId());
}
if(!RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed")) {
@@ -196,6 +198,16 @@
public boolean isCustomTheme() {
return (WeblogTheme.CUSTOM.equals(getActionWeblog().getEditorTheme()));
+ }
+
+ // has this weblog had a custom theme before?
+ public boolean isFirstCustomization() {
+ try {
+ return (getActionWeblog().getPageByAction(WeblogTemplate.ACTION_WEBLOG) == null);
+ } catch (WebloggerException ex) {
+ log.error("Error looking up weblog template", ex);
+ }
+ return false;
}
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties Thu Jun 7 19:33:38 2007
@@ -1370,6 +1370,9 @@
themeEditor.import=I want to copy the templates from the selected theme into my weblog.
themeEditor.importWarning=WARNING: this operation may overwrite some of your \
existing templates.
+themeEditor.importRequired=Since this is the first time you are going to try a \
+custom theme you must copy the templates from an existing theme to start with. \
+Please select the theme you would like to use as a starting point for your customizations.
themeEditor.save=Save
@@ -1492,6 +1495,10 @@
userRegister.tip.locale=Your preferred locale.
userRegister.tip.password=Your password.
userRegister.tip.passwordConfirm=Confirm your password.
+
+Register.disabled=The administrator of this site has disabled user registrations \
+at this time. Please contact the system administrators if you think this is \
+incorrect.
# errors from validation
Register.error.nameNull=User Name is a required field
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml Thu Jun 7 19:33:38 2007
@@ -97,6 +97,7 @@
<action name="register!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.core.Register">
<result name="input" type="tiles">.Register</result>
+ <result name="disabled" type="tiles">.RegisterDisabled</result>
<result name="success" type="tiles">.Welcome</result>
</action>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEditError.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEditError.jsp?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEditError.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEditError.jsp Thu Jun 7 19:33:38 2007
@@ -19,4 +19,4 @@
<p class="subtitle"><s:text name="stylesheetEdit.subtitle" /></p>
-<p class="pagetip"><s:text name="stylesheetEdit.noStylesheetOverride" /></p>
+<div class="notification"><s:text name="stylesheetEdit.noStylesheetOverride" /></div>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp Thu Jun 7 19:33:38 2007
@@ -30,28 +30,22 @@
function updateThemeChooser(selected) {
if(selected.value == 'shared') {
- selectedChooser = $('sharedChooser');
- selectedOptioner = $('sharedOptioner');
+ $('sharedChooser').style.backgroundColor="#CCFFCC";
+ $('sharedChooser').style.border="1px solid #008000";
+ $('sharedOptioner').show();
- otherChooser = $('customChooser');
- otherOptioner = $('customOptioner');
+ $('customChooser').style.backgroundColor="#eee";
+ $('customChooser').style.border="1px solid gray";
+ $('customOptioner').hide();
} else {
- selectedChooser = $('customChooser');
- selectedOptioner = $('customOptioner');
+ $('customChooser').style.backgroundColor="#CCFFCC";
+ $('customChooser').style.border="1px solid #008000";
+ $('customOptioner').show();
- otherChooser = $('sharedChooser');
- otherOptioner = $('sharedOptioner');
+ $('sharedChooser').style.backgroundColor="#eee";
+ $('sharedChooser').style.border="1px solid gray";
+ $('sharedOptioner').hide();
}
-
- // update styling on chooser
- selectedChooser.style.backgroundColor="#CCFFCC";
- selectedChooser.style.border="1px solid #008000";
- otherChooser.style.backgroundColor="#eee";
- otherChooser.style.border="1px solid grey";
-
- // update display of selected optioner
- otherOptioner.hide();
- selectedOptioner.show();
}
-->
</script>
@@ -69,13 +63,13 @@
<tr>
<td width="50%">
<div id="sharedChooser" class="chooser">
- <h2><input id="sharedRadio" type="radio" name="themeType" value="shared" <s:if test="!customTheme">checked="true"</s:if> onchange="updateThemeChooser(this)" /> <s:text name="themeEditor.sharedTheme" /></h2>
+ <h2><input id="sharedRadio" type="radio" name="themeType" value="shared" <s:if test="!customTheme">checked="true"</s:if> onclick="updateThemeChooser(this)" /> <s:text name="themeEditor.sharedTheme" /></h2>
<s:text name="themeEditor.sharedThemeDescription" />
</div>
</td>
<td width="50%">
<div id="customChooser" class="chooser">
- <h2><input id="customRadio" type="radio" name="themeType" value="custom" <s:if test="customTheme">checked="true"</s:if> onchange="updateThemeChooser(this)" /> <s:text name="themeEditor.customTheme" /></h2>
+ <h2><input id="customRadio" type="radio" name="themeType" value="custom" <s:if test="customTheme">checked="true"</s:if> onclick="updateThemeChooser(this)" /> <s:text name="themeEditor.customTheme" /></h2>
<s:text name="themeEditor.customThemeDescription" />
</div>
</td>
@@ -119,8 +113,14 @@
<div id="customOptioner" class="optioner" style="display:none;">
<p>
- <s:checkbox name="importTheme" /><s:text name="themeEditor.import" /><br/>
- <span class="warning"><s:text name="themeEditor.importWarning" /></span>
+ <s:if test="!firstCustomization">
+ <s:hidden name="importTheme" value="true" />
+ <span class="warning"><s:text name="themeEditor.importRequired" /></span>
+ </s:if>
+ <s:else>
+ <s:checkbox name="importTheme" /><s:text name="themeEditor.import" /><br/>
+ <span class="warning"><s:text name="themeEditor.importWarning" /></span>
+ </s:else>
</p>
<p>
<s:select id="customSelector" name="importThemeId" list="themes" listKey="id" listValue="name" size="1" onchange="previewImage($('customPreviewImg'), this[selectedIndex].value)"/>
@@ -129,7 +129,12 @@
<img id="customPreviewImg" src="" />
<!-- initialize preview image at page load -->
<script type="text/javascript">
- previewImage($('customPreviewImg'), '<s:property value="themes[0].id"/>');
+ <s:if test="customTheme">
+ previewImage($('customPreviewImg'), '<s:property value="themes[0].id"/>');
+ </s:if>
+ <s:else>
+ previewImage($('customPreviewImg'), '<s:property value="themeId"/>');
+ </s:else>
</script>
</p>
<p>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml Thu Jun 7 19:33:38 2007
@@ -79,6 +79,10 @@
<put name="content" value="/WEB-INF/jsps/core/Register.jsp" />
</definition>
+ <definition name=".RegisterDisabled" extends=".tiles-simplepage" >
+ <put name="content" value="/WEB-INF/jsps/core/RegisterDisabled.jsp" />
+ </definition>
+
<definition name=".Welcome" extends=".tiles-simplepage" >
<put name="content" value="/WEB-INF/jsps/core/Welcome.jsp" />
</definition>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/web.xml?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/web.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/web.xml Thu Jun 7 19:33:38 2007
@@ -267,6 +267,12 @@
</servlet>
<servlet>
+ <servlet-name>StrutsRedirectServlet</servlet-name>
+ <servlet-class>org.apache.roller.weblogger.ui.struts2.util.StrutsRedirectServlet</servlet-class>
+ <load-on-startup>9</load-on-startup>
+ </servlet>
+
+ <servlet>
<servlet-name>AtomServlet</servlet-name>
<servlet-class>org.apache.roller.weblogger.webservices.atomprotocol.AtomServlet</servlet-class>
</servlet>
@@ -461,6 +467,17 @@
<servlet-mapping>
<servlet-name>RedirectServlet</servlet-name>
<url-pattern>/admin/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- Redirect support for some old struts1 urls -->
+ <servlet-mapping>
+ <servlet-name>StrutsRedirectServlet</servlet-name>
+ <url-pattern>/roller-ui/yourWebsites.do</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>StrutsRedirectServlet</servlet-name>
+ <url-pattern>/roller-ui/authoring/commentManagement.do</url-pattern>
</servlet-mapping>
Modified: roller/branches/roller_guice/apps/weblogger/web/roller-ui/styles/roller.css
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/roller-ui/styles/roller.css?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/roller-ui/styles/roller.css (original)
+++ roller/branches/roller_guice/apps/weblogger/web/roller-ui/styles/roller.css Thu Jun 7 19:33:38 2007
@@ -445,8 +445,17 @@
border: 1px solid green;
}
.warnings {
- background-color: #FFFFAA;
- border: 1px solid yellow;
+ background-color: #ffffce;
+ border: 1px solid #f0c000;
+}
+div.notification {
+ width: 80%;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 25px;
+ font-size: larger;
+ background-color: #ffffce;
+ border: 1px solid #f0c000;
}
div.error {
background-color: #ffcccc;
Modified: roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/Weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/Weblog.vm?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/Weblog.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/Weblog.vm Thu Jun 7 19:33:38 2007
@@ -2,12 +2,16 @@
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>$model.weblog.name : $model.weblogPage.name</title>
+ #showAutodiscoveryLinks($model.weblog)
+
<style type="text/css">
#includeTemplate($model.weblog "_css")
</style>
- #showAutodiscoveryLinks($model.weblog)
- <title>$model.weblog.name : $model.weblogPage.name</title>
+
+ <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.customStylesheet">
</head>
+
<body>
<div id="block">
Modified: roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml Thu Jun 7 19:33:38 2007
@@ -8,6 +8,9 @@
<!-- theme preview image -->
<preview-image path="sm-theme-brushedmetal.png" />
+ <!-- custom stylesheet -->
+ <custom-stylesheet path="brushedmetal-custom.css" />
+
<!-- templates -->
<template action="weblog">
<name>Weblog</name>
Modified: roller/branches/roller_guice/apps/weblogger/web/themes/sotto/Weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/sotto/Weblog.vm?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/sotto/Weblog.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/sotto/Weblog.vm Thu Jun 7 19:33:38 2007
@@ -8,6 +8,8 @@
#showAutodiscoveryLinks($model.weblog)
<style type="text/css">#includeTemplate($model.weblog "_css")</style>
<link rel="stylesheet" type="text/css" href='$url.resource("styles/default.css")' />
+
+ <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.customStylesheet">
</head>
<body>
Modified: roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml Thu Jun 7 19:33:38 2007
@@ -8,6 +8,9 @@
<!-- theme preview image -->
<preview-image path="sm-theme-sotto.png" />
+ <!-- custom stylesheet -->
+ <custom-stylesheet path="sotto-custom.css" />
+
<!-- templates -->
<template action="weblog">
<name>Weblog</name>
Modified: roller/branches/roller_guice/merges.txt
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/merges.txt?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
--- roller/branches/roller_guice/merges.txt (original)
+++ roller/branches/roller_guice/merges.txt Thu Jun 7 19:33:38 2007
@@ -1,4 +1,7 @@
+June 6, 2007
+svn merge -r 544667: https://svn.apache.org/repos/asf/roller/trunk
+
June 5, 2007
svn merge -r 544642:544667 https://svn.apache.org/repos/asf/roller/trunk
svn merge -r 544028:544642 https://svn.apache.org/repos/asf/roller/trunk
Modified: roller/branches/roller_guice/tools/roller-core/roller-core.jar
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/tools/roller-core/roller-core.jar?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
Binary files - no diff available.
Modified: roller/branches/roller_guice/tools/roller-planet/roller-planet-business.jar
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/tools/roller-planet/roller-planet-business.jar?view=diff&rev=545374&r1=545373&r2=545374
==============================================================================
Binary files - no diff available.