Author: gmazza
Date: Mon Aug 5 22:22:19 2013
New Revision: 1510787
URL: http://svn.apache.org/r1510787
Log:
Minor Sonar cleanups and some JSP tweaking on the startup page (preventing
ability to create a blog without a user, and no second user until a blog is
created, the latter one enforced later on by the app anyway.)
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
roller/trunk/docs/README.txt
roller/trunk/pom.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java?rev=1510787&r1=1510786&r2=1510787&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
Mon Aug 5 22:22:19 2013
@@ -22,6 +22,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.sql.Connection;
import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
@@ -37,36 +38,36 @@ import org.springframework.beans.factory
* Walk user through install process.
*/
public class Install extends UIAction {
-
+
private static Log log = LogFactory.getLog(Install.class);
-
+
private static final String DATABASE_ERROR = "database_error";
private static final String CREATE_DATABASE = "create_database";
private static final String UPGRADE_DATABASE = "upgrade_database";
private static final String BOOTSTRAP = "bootstrap";
-
+
private Throwable rootCauseException = null;
private boolean error = false;
private boolean success = false;
private List<String> messages = null;
private String databaseName = "Unknown";
-
-
+
+
public boolean isUserRequired() {
return false;
}
-
+
public boolean isWeblogRequired() {
return false;
}
-
-
+
+
public String execute() {
-
+
if (WebloggerFactory.isBootstrapped()) {
return SUCCESS;
}
-
+
if (WebloggerStartup.getDatabaseProviderException() != null) {
StartupException se =
WebloggerStartup.getDatabaseProviderException();
if (se.getRootCause() != null) {
@@ -75,12 +76,12 @@ public class Install extends UIAction {
rootCauseException = se;
}
messages = se.getStartupLog();
-
+
log.debug("Forwarding to database error page");
setPageTitle("installer.error.connection.pageTitle");
return DATABASE_ERROR;
- }
-
+ }
+
if (WebloggerStartup.isDatabaseCreationRequired()) {
log.debug("Forwarding to database table creation page");
setPageTitle("installer.database.creation.pageTitle");
@@ -91,72 +92,72 @@ public class Install extends UIAction {
setPageTitle("installer.database.upgrade.pageTitle");
return UPGRADE_DATABASE;
}
-
- setPageTitle("installer.error.unknown.pageTitle");
+
+ setPageTitle("installer.error.unknown.pageTitle");
rootCauseException = new Exception("UNKNOWN ERROR");
rootCauseException.fillInStackTrace();
return BOOTSTRAP;
}
-
-
+
+
public String create() {
-
- if(WebloggerFactory.isBootstrapped()) {
+
+ if (WebloggerFactory.isBootstrapped()) {
return SUCCESS;
}
-
+
try {
messages = WebloggerStartup.createDatabase();
-
+
success = true;
} catch (StartupException se) {
error = true;
messages = se.getStartupLog();
}
-
+
setPageTitle("installer.database.creation.pageTitle");
return CREATE_DATABASE;
}
-
-
+
+
public String upgrade() {
-
- if(WebloggerFactory.isBootstrapped()) {
+
+ if (WebloggerFactory.isBootstrapped()) {
return SUCCESS;
}
-
+
try {
messages = WebloggerStartup.upgradeDatabase(true);
-
+
success = true;
} catch (StartupException se) {
error = true;
messages = se.getStartupLog();
}
-
+
setPageTitle("installer.database.upgrade.pageTitle");
return UPGRADE_DATABASE;
}
-
-
+
+
public String bootstrap() {
log.info("ENTERING");
-
+
if (WebloggerFactory.isBootstrapped()) {
log.info("EXITING - already bootstrapped, forwarding to Roller");
return SUCCESS;
}
-
+
try {
// trigger bootstrapping process
WebloggerFactory.bootstrap();
-
+
// trigger initialization process
WebloggerFactory.getWeblogger().initialize();
-
+
// also need to do planet if it's configured
if
(WebloggerConfig.getBooleanProperty("planet.aggregator.enabled")) {
-
+
// Now prepare the core services of planet so we can bootstrap
it
try {
WebloggerStartup.prepare();
@@ -164,9 +165,9 @@ public class Install extends UIAction {
log.fatal("Roller Planet startup failed during app
preparation", ex);
}
}
- log.info("EXITING - Bootstrap sucessful, forwarding to Roller");
+ log.info("EXITING - Bootstrap successful, forwarding to Roller");
return SUCCESS;
-
+
} catch (BootstrapException ex) {
log.error("BootstrapException", ex);
rootCauseException = ex;
@@ -177,42 +178,45 @@ public class Install extends UIAction {
log.error("Throwable", t);
rootCauseException = t;
}
-
+
log.info("EXITING - Bootstrap failed, forwarding to error page");
- setPageTitle("installer.error.unknown.pageTitle");
+ setPageTitle("installer.error.unknown.pageTitle");
return BOOTSTRAP;
}
-
-
+
+
public String getDatabaseProductName() {
String name = "unknown";
-
+
Connection con = null;
try {
con = WebloggerStartup.getDatabaseProvider().getConnection();
name = con.getMetaData().getDatabaseProductName();
- } catch (Exception intentionallyIgnored) {
+ } catch (Exception intentionallyIgnored) {
// ignored
} finally {
- if(con != null) try {
- con.close();
- } catch(Exception ex) {}
+ if (con != null) {
+ try {
+ con.close();
+ } catch (Exception ex) {
+ }
+ }
}
-
+
return name;
}
-
+
public String getProp(String key) {
// Static config only, we don't have database yet
String value = WebloggerConfig.getProperty(key);
return (value == null) ? key : value;
}
-
-
+
+
public Throwable getRootCauseException() {
return rootCauseException;
}
-
+
public String getRootCauseStackTrace() {
String stackTrace = "";
if (getRootCauseException() != null) {
@@ -242,5 +246,5 @@ public class Install extends UIAction {
public boolean isSuccess() {
return success;
}
-
+
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java?rev=1510787&r1=1510786&r2=1510787&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
Mon Aug 5 22:22:19 2013
@@ -103,9 +103,7 @@ public class MainMenu extends UIAction {
public String resign() {
-
- User user = getAuthenticatedUser();
-
+
try {
UserManager umgr =
WebloggerFactory.getWeblogger().getUserManager();
WeblogManager wmgr =
WebloggerFactory.getWeblogger().getWeblogManager();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1510787&r1=1510786&r2=1510787&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
Mon Aug 5 22:22:19 2013
@@ -49,8 +49,8 @@ public class Register extends UIAction i
private static Log log = LogFactory.getLog(Register.class);
- public static String DEFAULT_ALLOWED_CHARS = "A-Za-z0-9";
-
+ public static final String DEFAULT_ALLOWED_CHARS = "A-Za-z0-9";
+
// this is a no-no, we should not need this
private HttpServletRequest servletRequest = null;
@@ -83,7 +83,7 @@ public class Register extends UIAction i
@SkipValidation
public String execute() {
- // if registation is disabled, then don't allow registration
+ // if registration is disabled, then don't allow registration
try {
if
(!WebloggerRuntimeConfig.getBooleanProperty("users.registration.enabled")
// unless there are 0 users (need to allow creation of first
user)
@@ -164,7 +164,7 @@ public class Register extends UIAction i
public String save() {
- // if registation is disabled, then don't allow registration
+ // if registration is disabled, then don't allow registration
try {
if
(!WebloggerRuntimeConfig.getBooleanProperty("users.registration.enabled")
// unless there are 0 users (need to allow creation of first
user)
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java?rev=1510787&r1=1510786&r2=1510787&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
Mon Aug 5 22:22:19 2013
@@ -46,14 +46,10 @@ public class Setup extends UIAction {
// weblogs for frontpage blog chooser
private Collection<Weblog> weblogs;
-
-
public Setup() {
- // TODO: i18n
this.pageTitle = "index.heading";
}
-
-
+
@Override
public boolean isUserRequired() {
return false;
@@ -63,8 +59,7 @@ public class Setup extends UIAction {
public boolean isWeblogRequired() {
return false;
}
-
-
+
public String execute() {
try {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java?rev=1510787&r1=1510786&r2=1510787&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
Mon Aug 5 22:22:19 2013
@@ -71,7 +71,7 @@ public abstract class UIAction extends A
// the name of the menu this action wants to show, or null for no menu
protected String desiredMenu = null;
- // page title
+ // page title, called by some Tiles JSPs (e.g., tiles-simplepage.jsp)
protected String pageTitle = null;
protected String salt = null;
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1510787&r1=1510786&r2=1510787&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Mon Aug
5 22:22:19 2013
@@ -691,7 +691,7 @@ via the <b>Server Admin->Configuration</
below once you have created at least one weblog.
frontpageConfig.frontpageBlogName=Name of weblog to serve as frontpage blog
-frontpageConfig.frontpageAgregated=Enable aggregated site-wide frontpage
+frontpageConfig.frontpageAggregated=Enable aggregated site-wide frontpage
frontpageConfig.save=Save
frontpageConfig.values.saved=Properties successfully saved
frontpageConfig.values.error=Error saving properties
Modified: roller/trunk/app/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/struts.xml?rev=1510787&r1=1510786&r2=1510787&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/struts.xml (original)
+++ roller/trunk/app/src/main/resources/struts.xml Mon Aug 5 22:22:19 2013
@@ -71,7 +71,6 @@
<result name="access-denied" type="tiles">.denied</result>
</global-results>
-
<!-- Simple actions which basically just replace the global-forwards
from
the old struts 1 config. this is the only way to do it in struts
2 -->
<action name="home">
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp?rev=1510787&r1=1510786&r2=1510787&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp Mon Aug 5
22:22:19 2013
@@ -34,10 +34,13 @@
</s:if>
</b><br /><br />
<s:text name="index.createUserHelp" /><br /><br />
- <s:text name="index.createUserBy" />
- <a href='<s:url action="register"/>'>
- <s:text name="index.createUserPage" /></a>.
- <br /><br /><br />
+ <s:if test="userCount == 0">
+ <s:text name="index.createUserBy" />
+ <a href='<s:url action="register"/>'>
+ <s:text name="index.createUserPage" /></a>.
+ <br /><br />
+ </s:if>
+ <br />
</li>
<%-- STEP 2: Create a weblog if you don't already have one --%>
@@ -49,10 +52,13 @@
</s:if>
</b><br /><br />
<s:text name="index.createWeblogHelp" /><br /><br />
- <s:text name="index.createWeblogBy" />
- <a href='<s:url action="createWeblog"/>'>
- <s:text name="index.createWeblogPage" /></a>.
- <br /><br /><br />
+ <s:if test="userCount > 0 && blogCount == 0">
+ <s:text name="index.createWeblogBy" />
+ <a href='<s:url action="createWeblog"/>'>
+ <s:text name="index.createWeblogPage" /></a>.
+ <br /><br />
+ </s:if>
+ <br />
</li>
<%-- STEP 3: Designate a weblog to be the frontpage weblog --%>
@@ -80,7 +86,7 @@
</tr>
<tr>
<td class="label">
- <s:text name="frontpageConfig.frontpageAgregated"
/>
+ <s:text name="frontpageConfig.frontpageAggregated"
/>
<br /><br />
</td>
<td class="field">
Modified: roller/trunk/docs/README.txt
URL:
http://svn.apache.org/viewvc/roller/trunk/docs/README.txt?rev=1510787&r1=1510786&r2=1510787&view=diff
==============================================================================
--- roller/trunk/docs/README.txt (original)
+++ roller/trunk/docs/README.txt Mon Aug 5 22:22:19 2013
@@ -6,4 +6,5 @@ test plans.
roller-template-guide.odt - How to create Roller templates and themes
roller-dev-guide.odt - Incomplete developer guide
examples/ - example configuration and script files
- testing/ - Test plans (under development)
+ testing/ - Various test scripts
+
Modified: roller/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1510787&r1=1510786&r2=1510787&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Mon Aug 5 22:22:19 2013
@@ -16,7 +16,7 @@
<name>Roller project</name>
<description>
Roller is an open source blog server built with open source Java
- libraries including Apache OpenJPA, Struts2, Velocity and Commons.
+ libraries including Spring, Struts2, Velocity and Commons.
</description>
<url>http://roller.apache.org</url>
<inceptionYear>2002</inceptionYear>
@@ -30,7 +30,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <roller.version>5.1.0-SNAPSHOT</roller.version>
<derby.version>10.10.1.1</derby.version>
</properties>
