svn commit: r1613314 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/themes/ java/org/apache/roller/weblogger/pojos/ java/org/apache/roller/weblogger/ui/struts2/editor/ reso
Author: gmazza
Date: Thu Jul 24 22:22:57 2014
New Revision: 1613314
URL: http://svn.apache.org/r1613314
Log:
Removal of customstylesheet column from weblog table. Tested that it works
during 5.0.x -> 5.1 upgrade.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/createdb.vm
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=1613314&r1=1613313&r2=1613314&view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
Thu Jul 24 22:22:57 2014
@@ -295,11 +295,8 @@ public class ThemeManagerImpl implements
}
}
- // always update this weblog's theme and customStylesheet, then
save
+ // set weblog's theme to custom, then save
weblog.setEditorTheme(WeblogTheme.CUSTOM);
- if (theme.getStylesheet() != null) {
-
weblog.setCustomStylesheetPath(theme.getStylesheet().getLink());
- }
wmgr.saveWeblog(weblog);
// now lets import all the theme resources
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java?rev=1613314&r1=1613313&r2=1613314&view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
Thu Jul 24 22:22:57 2014
@@ -87,7 +87,7 @@ public class WeblogCustomTheme extends W
* Returns null if no stylesheet can be found.
*/
public ThemeTemplate getStylesheet() throws WebloggerException {
-return getTemplateByLink(this.weblog.getCustomStylesheetPath());
+return getTemplateByAction(ComponentType.STYLESHEET);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java?rev=1613314&r1=1613313&r2=1613314&view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
Thu Jul 24 22:22:57 2014
@@ -118,15 +118,14 @@ public class WeblogSharedTheme extends W
// load from theme first to see if we even support a stylesheet
ThemeTemplate stylesheet = this.theme.getStylesheet();
-if(stylesheet != null) {
+if (stylesheet != null) {
// now try getting custom version from weblog
ThemeTemplate override = WebloggerFactory.getWeblogger()
-.getWeblogManager().getTemplateByLink(this.weblog,
stylesheet.getLink());
-if(override != null) {
+.getWeblogManager().getTemplateByAction(this.weblog,
ComponentType.STYLESHEET);
+if (override != null) {
stylesheet = override;
}
}
-
return stylesheet;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1613314&r1=1613313&r2=1613314
svn commit: r1613276 - in /roller/trunk/app/src: main/java/org/apache/roller/weblogger/business/ main/java/org/apache/roller/weblogger/business/jpa/ main/java/org/apache/roller/weblogger/business/them
Author: gmazza
Date: Thu Jul 24 20:44:41 2014
New Revision: 1613276
URL: http://svn.apache.org/r1613276
Log:
Actions now stored as Enums (ComponentType) within Java, new action STYLESHEET
added.
Removed:
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-responsive-mobile.png
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
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=1613276&r1=1613275&r2=1613276&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
Thu Jul 24 20:44:41 2014
@@ -25,6 +25,7 @@ import org.apache.roller.weblogger.Weblo
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;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
@@ -163,7 +164,7 @@ public interface WeblogManager {
/**
* Get a custom template by the action it supports.
*/
-WeblogTemplate getTemplateByAction(Weblog w, String a) throws
WebloggerException;
+WeblogTemplate getTemplateByAction(Weblog w, ComponentType a) throws
WebloggerException;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1613276&r1=1613275&r2=1613276&view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
Thu Jul 24 20:44:41 2014
@@ -45,6 +45,7 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.
svn commit: r1613234 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java resources/sql/500-to-510-migration.vm
Author: gmazza
Date: Thu Jul 24 18:22:11 2014
New Revision: 1613234
URL: http://svn.apache.org/r1613234
Log:
Tested migration process. Reactivated dropIndex commands (as they are needed
if they exist and one is dropping a column), however process changed to now
ignores any index-doesn't-exist errors.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java?rev=1613234&r1=1613233&r2=1613234&view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
Thu Jul 24 18:22:11 2014
@@ -126,6 +126,10 @@ public class SQLScriptRunner {
successMessage(command);
} catch (SQLException ex) {
+if (command.contains("drop foreign key") ||
command.contains("drop index")) {
+errorMessage("INFO: SQL command [" + command + "] failed,
ignored.");
+continue;
+}
// add error message with text of SQL command to messages
errorMessage("ERROR: SQLException executing SQL [" + command
+ "] : " + ex.getLocalizedMessage());
Modified: roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm?rev=1613234&r1=1613233&r2=1613234&view=diff
==
--- roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm (original)
+++ roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm Thu Jul 24
18:22:11 2014
@@ -12,7 +12,7 @@ DON'T RUN THIS, IT'S NOT A DATABASE CREA
#dropColumn('weblog' 'defaultpageid')
#dropColumn('weblog' 'weblogdayid')
#dropColumn('weblog' 'defaultplugins')
-#addColumnNotNull('weblog' 'visible' $db.BOOLEAN_SQL_TYPE_TRUE)
+#addColumnNotNull('weblog' 'visible' $db.BOOLEAN_SQL_TYPE $db.BOOLEAN_TRUE)
#addColumnNull('weblog' 'tagline' "varchar(255)")
update weblog set visible = isenabled;
@@ -57,12 +57,10 @@ delete from weblogcategory where name =
-- Removal of custom ping targets
delete from pingtarget where websiteid is not null;
--- (this indexes do not exist on all Roller databases for some reason)
--- #dropIndex("pingtarget" "pt_websiteid_fk")
+#dropIndex("pingtarget" "pt_websiteid_fk")
#dropColumn("pingtarget" "websiteid")
--- NOTE: you might need to drop this index on some Roller databases
--- drop index folder_namefolderid_uq on bookmark_folder;
+#dropIndex("bookmark_folder" "folder_namefolderid_uq")
-- Removal of bookmark subfolders and renaming of former root folder to
'default'
-- If a bookmark folder with name 'default' already exists, rename it by
adding its id to it.
@@ -86,6 +84,5 @@ update roller_mediafiledir set name = 'd
-- Referer table no longer populated, retaining for older DB's in case legacy
data
-- is desired to keep; but removing its FK relationships to other tables
--- (these indexes do not exist on all Roller databases for some reason)
--- #dropIndex("referer" "ref_entryid_fk")
--- #dropIndex("referer" "ref_websiteid_fk")
+#dropIndex("referer" "ref_entryid_fk")
+#dropIndex("referer" "ref_websiteid_fk")
svn commit: r1613190 - in /roller/trunk/app/src: main/java/org/apache/roller/weblogger/business/ main/java/org/apache/roller/weblogger/business/jpa/ main/java/org/apache/roller/weblogger/business/plug
Author: gmazza
Date: Thu Jul 24 17:07:23 2014
New Revision: 1613190
URL: http://svn.apache.org/r1613190
Log:
Changed code terminology from 'page' to 'template' and (in many cases)
'website' to 'weblog'
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
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=1613190&r1=1613189&r2=1613190&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
Thu Jul 24 17:07:23 2014
@@ -31,7 +31,7 @@ import org.apache.roller.weblogger.pojos
/**
- * Interface to weblog and page template management.
+ * Interface to weblog and weblog custom template management.
*/
public interface WeblogManager {
@@ -143,56 +143,56 @@ public interface WeblogManager {
throws WebloggerException;
/**
- * Store page.
+ * Store a custom weblog template.
*/
-void savePage(WeblogTemplate data) throws WebloggerException;
+void saveTemplate(WeblogTemplate data) throws WebloggerException;
/**
- * Remove page.
+ * Remove a custom template.
*/
-void removePage(WeblogTemplate page) throws WebloggerException;
+void removeTemplate(WeblogTemplate template) throws WebloggerException;
/**
- * Get page by id.
+ * Get a custom template by its id.
*/
-WeblogTemplate getPage(String id) throws WebloggerException;
+WeblogTemplate getTemplate(String id) throws WebloggerException;
/**
- * Get user's page by action.
+ * Get a custom template by the action it supports.
*/
-WeblogTemplate getPageByAction(Weblog w, String a) throws
WebloggerException;
+WeblogTemplate getTemplateByAction(Weblog w, String a) throws
WebloggerException;
/**
- * Get user's page by name.
+ * Get a custom template by its name.
*/
-WeblogTemplate getPageByName(Weblog w, String p) throws WebloggerException;
+WeblogTemplate getTemplateByName(Weblog w, String p) throws
WebloggerException;
/**
- * Get website's page by link.
+ * Get a custom template by its link.
*/
-WeblogTemplate getPageByLink(Weblog w, String p)
+WeblogTemplate getTemplateByLink(Weblog w, String p)
throws WebloggerException;
/**
- * Get template code by Type.
+ * Get a custom template rendition by parent template ID and rendition
type.
*/
-CustomTemplateRendition getTemplateRenditionByType(String templateName,
RenditionType type)
+CustomTemplateRendition getTemplateRenditionByType(String templateId,
RenditionType type)
throws WebloggerException ;
/**
- * Save template code
+ * Save a custom template rendition
*/
svn commit: r1613165 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/ java/org/apache/roller/weblogger/business/themes/ java/org/apache/roller/weblogger/pojos/ resources/org
Author: gmazza
Date: Thu Jul 24 15:51:04 2014
New Revision: 1613165
URL: http://svn.apache.org/r1613165
Log:
Unused code removed.
Added:
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-responsive-mobile.png
- copied unchanged from r1613159,
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-resposive-mobile.png
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-responsive.png
- copied unchanged from r1613069,
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-resposive.png
Removed:
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-resposive-mobile.png
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-resposive.png
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml
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=1613165&r1=1613164&r2=1613165&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
Thu Jul 24 15:51:04 2014
@@ -142,7 +142,7 @@ public interface WeblogManager {
List getWeblogsByLetter(char letter, int offset, int length)
throws WebloggerException;
-/**
+/**
* Store page.
*/
void savePage(WeblogTemplate data) throws WebloggerException;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java?rev=1613165&r1=1613164&r2=1613165&view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
Thu Jul 24 15:51:04 2014
@@ -86,7 +86,7 @@ public class WeblogCustomTheme extends W
* Returns null if no stylesheet can be found.
*/
public ThemeTemplate getStylesheet() throws WebloggerException {
- return getTemplateByLink(this.weblog.getCustomStylesheetPath());
+return getTemplateByLink(this.weblog.getCustomStylesheetPath());
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1613165&r1=1613164&r2=1613165&view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
Thu Jul 24 15:51:04 2014
@@ -122,16 +122,9 @@ public class Weblog implements Serializa
//--- Good citizenship
public String toString() {
-StringBuilder buf = new StringBuilder();
-buf.append("{");
-buf.append(getId());
-buf.append(", ").append(getHandle());
-buf.append(", ").append(getName());
-buf.append(", ").append(getEmailAddress());
-buf.append(", ").append(getLocale());
-buf.append(", ").append(getTimeZone());
-buf.append("}");
-return buf.toString();
+return "{" + getId() + ", " + getHandle()
++ ", " + getName() + ", " + getEmailAddress()
++ ", " + getLocale() + ", " + getTimeZone() + "}";
}
public boolean equals(Object other) {
@@ -170,20 +163,6 @@ public class Weblog implements Serializa
}
/**
- * Lookup the default page for this website.
- */
-public ThemeTemplate getDefaultPage() throws WebloggerException {
-
-// look for the page in our Theme
-Theme weblogTheme = getTheme();
-if(weblogTheme != null) {
-return weblogTheme.getDefaultTemplate();
-}
-
-return null;
-}
-
-/**
* Id of the Website.
*/
public String getId() {
@@ -455,38 +434,6 @@ public class Weblog implements Serializa
return false;
}
-/** Get number of users associated with website */
-public int getUserCount() {
-
[jira] [Commented] (ROL-2042) email and username fields from LDAP
[ https://issues.apache.org/jira/browse/ROL-2042?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14073249#comment-14073249 ] Glen Mazza commented on ROL-2042: - Awesome! Many thanks Juergen! I haven't forgotten the LDAP stuff but I'm trying to get some DB changes in for 5.1 before a necessary data model freeze for migration testing. This will be looked at soon (along with the other LDAP issues in JIRA). > email and username fields from LDAP > --- > > Key: ROL-2042 > URL: https://issues.apache.org/jira/browse/ROL-2042 > Project: Apache Roller > Issue Type: Improvement > Components: Authentication, Roles and Access Controls >Affects Versions: 5.1 >Reporter: Jürgen Weber >Assignee: Roller Unassigned > Attachments: CustomUserRegistry.patch, LDAPUserDetails.java, > LDAPUserDetailsMapper.java, security.xml > > > Current implementation of LDAP based Spring security does not retrieve email > and name attributes from LDAP. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (ROL-2042) email and username fields from LDAP
[ https://issues.apache.org/jira/browse/ROL-2042?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jürgen Weber updated ROL-2042: -- Attachment: security.xml LDAPUserDetails.java LDAPUserDetailsMapper.java CustomUserRegistry.patch This is a fix to resolve the issue. Please test and add to trunk. The security.xml is based on the Apache Directory Server sample from http://directory.apache.org/apacheds/basic-ug/1.5-sample-configuration.html http://directory.apache.org/apacheds/basic-ug/resources/apache-ds-tutorial.ldif > email and username fields from LDAP > --- > > Key: ROL-2042 > URL: https://issues.apache.org/jira/browse/ROL-2042 > Project: Apache Roller > Issue Type: Improvement > Components: Authentication, Roles and Access Controls >Affects Versions: 5.1 >Reporter: Jürgen Weber >Assignee: Roller Unassigned > Attachments: CustomUserRegistry.patch, LDAPUserDetails.java, > LDAPUserDetailsMapper.java, security.xml > > > Current implementation of LDAP based Spring security does not retrieve email > and name attributes from LDAP. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (ROL-2042) email and username fields from LDAP
Jürgen Weber created ROL-2042: - Summary: email and username fields from LDAP Key: ROL-2042 URL: https://issues.apache.org/jira/browse/ROL-2042 Project: Apache Roller Issue Type: Improvement Components: Authentication, Roles and Access Controls Affects Versions: 5.1 Reporter: Jürgen Weber Assignee: Roller Unassigned Current implementation of LDAP based Spring security does not retrieve email and name attributes from LDAP. -- This message was sent by Atlassian JIRA (v6.2#6252)
