Author: snoopdave
Date: Fri Jun 22 18:27:08 2007
New Revision: 549994
URL: http://svn.apache.org/viewvc?view=rev&rev=549994
Log:
Latest from trunk
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/branches/roller_guice/apps/weblogger/src/sql/320-to-400-migration.vm
roller/branches/roller_guice/merges.txt
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?view=diff&rev=549994&r1=549993&r2=549994
==============================================================================
---
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
(original)
+++
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
Fri Jun 22 18:27:08 2007
@@ -171,11 +171,6 @@
}
- // do we need to force a specific locale for the request?
- if(feedRequest.getLocale() == null && !weblog.isShowAllLangs()) {
- feedRequest.setLocale(weblog.getLocale());
- }
-
// validation. make sure that request input makes sense.
boolean invalid = false;
if(feedRequest.getLocale() != null) {
@@ -210,6 +205,11 @@
return;
}
+
+ // do we need to force a specific locale for the request?
+ if(feedRequest.getLocale() == null && !weblog.isShowAllLangs()) {
+ feedRequest.setLocale(weblog.getLocale());
+ }
// looks like we need to render content
HashMap model = new HashMap();
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?view=diff&rev=549994&r1=549993&r2=549994
==============================================================================
---
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
(original)
+++
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
Fri Jun 22 18:27:08 2007
@@ -219,6 +219,7 @@
}
}
+ log.debug("Looking for template to use for rendering");
// figure out what template to use
ThemeTemplate page = null;
@@ -287,11 +288,6 @@
log.debug("page found, dealing with it");
- // do we need to force a specific locale for the request?
- if(pageRequest.getLocale() == null && !weblog.isShowAllLangs()) {
- pageRequest.setLocale(weblog.getLocale());
- }
-
// validation. make sure that request input makes sense.
boolean invalid = false;
if(pageRequest.getWeblogPageName() != null && page.isHidden()) {
@@ -341,9 +337,16 @@
if(invalid) {
+ log.debug("page failed validation, bailing out");
if(!response.isCommitted()) response.reset();
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
+ }
+
+
+ // do we need to force a specific locale for the request?
+ if(pageRequest.getLocale() == null && !weblog.isShowAllLangs()) {
+ pageRequest.setLocale(weblog.getLocale());
}
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java?view=diff&rev=549994&r1=549993&r2=549994
==============================================================================
---
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
(original)
+++
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
Fri Jun 22 18:27:08 2007
@@ -62,7 +62,11 @@
public String execute() {
-
+
+ if(RollerFactory.isBootstrapped()) {
+ return SUCCESS;
+ }
+
if(WebloggerStartup.getDatabaseProviderException() != null) {
StartupException se =
WebloggerStartup.getDatabaseProviderException();
if (se.getRootCause() != null) {
@@ -91,6 +95,10 @@
public String create() {
+ if(RollerFactory.isBootstrapped()) {
+ return SUCCESS;
+ }
+
try {
messages = WebloggerStartup.createDatabase();
@@ -106,6 +114,10 @@
public String upgrade() {
+ if(RollerFactory.isBootstrapped()) {
+ return SUCCESS;
+ }
+
try {
messages = WebloggerStartup.upgradeDatabase(true);
@@ -120,6 +132,10 @@
public String bootstrap() {
+
+ if(RollerFactory.isBootstrapped()) {
+ return SUCCESS;
+ }
try {
// trigger bootstrapping process
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?view=diff&rev=549994&r1=549993&r2=549994
==============================================================================
---
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
(original)
+++
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
Fri Jun 22 18:27:08 2007
@@ -144,6 +144,13 @@
addMessage("websiteSettings.commentsOffForInactiveWeblog");
}
+ // if blog has unchecked 'show all langs' then we must make sure
+ // the multi-language blogging option is enabled.
+ // TODO: this should be properly reflected via the UI
+ if(!weblog.isShowAllLangs() && !weblog.isEnableMultiLang()) {
+ weblog.setEnableMultiLang(true);
+ }
+
// save config
umgr.saveWebsite(weblog);
Modified:
roller/branches/roller_guice/apps/weblogger/src/sql/320-to-400-migration.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/sql/320-to-400-migration.vm?view=diff&rev=549994&r1=549993&r2=549994
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/sql/320-to-400-migration.vm
(original)
+++ roller/branches/roller_guice/apps/weblogger/src/sql/320-to-400-migration.vm
Fri Jun 22 18:27:08 2007
@@ -53,6 +53,11 @@
-- add new custom stylesheet column to website table
#addColumnNull("website" "customstylesheet" "varchar(128)")
+-- fix blogs which have unchecked showalllangs but did not check
enablemultilang
+update website set enablemultilang = 1 where showalllangs = 0;
+
+
+
-- remove old id column of group subscription table
alter table rag_group_subscription drop column id;
Modified: roller/branches/roller_guice/merges.txt
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/merges.txt?view=diff&rev=549994&r1=549993&r2=549994
==============================================================================
--- roller/branches/roller_guice/merges.txt (original)
+++ roller/branches/roller_guice/merges.txt Fri Jun 22 18:27:08 2007
@@ -1,3 +1,5 @@
+June 22, 2007
+svn merge -r 549297:549614 https://svn.apache.org/repos/asf/roller/trunk
June 21, 2007
svn merge -r 549150:549297 https://svn.apache.org/repos/asf/roller/trunk
