Author: gmazza
Date: Fri Aug 8 22:23:33 2014
New Revision: 1616900
URL: http://svn.apache.org/r1616900
Log:
Minor cleanup while testing OpenID
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
roller/trunk/app/src/main/resources/sql/droptables.sql
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java?rev=1616900&r1=1616899&r2=1616900&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
Fri Aug 8 22:23:33 2014
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.CustomTemplateRendition;
import org.apache.roller.weblogger.pojos.StatCount;
-import org.apache.roller.weblogger.pojos.TemplateRendition.RenditionType;
import org.apache.roller.weblogger.pojos.ThemeTemplate.ComponentType;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java?rev=1616900&r1=1616899&r2=1616900&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
Fri Aug 8 22:23:33 2014
@@ -19,7 +19,6 @@
package org.apache.roller.weblogger.pojos;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.TemplateRendition.RenditionType;
import org.apache.roller.weblogger.pojos.TemplateRendition.TemplateLanguage;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java?rev=1616900&r1=1616899&r2=1616900&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
Fri Aug 8 22:23:33 2014
@@ -24,7 +24,6 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
Modified: roller/trunk/app/src/main/resources/sql/droptables.sql
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/droptables.sql?rev=1616900&r1=1616899&r2=1616900&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/droptables.sql (original)
+++ roller/trunk/app/src/main/resources/sql/droptables.sql Fri Aug 8 22:23:33
2014
@@ -35,7 +35,6 @@ drop table autoping;
drop table pingtarget;
drop table bookmark;
drop table bookmark_folder;
-drop table roller_userattribute;
drop table roller_mediafiletag;
drop table roller_mediafile;
drop table roller_mediafiledir;
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp?rev=1616900&r1=1616899&r2=1616900&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp Fri Aug 8
22:23:33 2014
@@ -46,7 +46,7 @@ if (cmaEnabled) {
<tr>
<td width="20%" align="right"><s:text name="loginPage.openID"
/></td>
<td width="80%">
- <input type="text" name="openid_identifier"
id="openid_identifier" class="f_openid_identifier" size="40" maxlength="255" />
+ <input type="text" name="openid_identifier"
id="openid_identifier" class="f_openid_identifier" size="40" maxlength="255"
style="width: 35%"/>
</td>
</tr>
<tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp?rev=1616900&r1=1616899&r2=1616900&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp Fri Aug 8
22:23:33 2014
@@ -68,7 +68,7 @@
<s:hidden name="bean.password" />
</s:else>
- <s:if test="openIdConfiguration != 'disabled'">
+ <s:if test="authMethod == 'OPENID' || authMethod == 'DB_OPENID'">
<tr>
<td class="label"><label for="openIdUrl" /><s:text
name="userSettings.openIdUrl" /></label></td>
<td class="field"><s:textfield name="bean.openIdUrl" size="40"
maxlength="255" id="f_openid_identifier" /></td>
