svn commit: r1612451 - in /roller/trunk/app/src/main/resources: org/apache/roller/weblogger/pojos/Weblog.orm.xml org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml sql/500-to-510-migration
Author: gmazza
Date: Tue Jul 22 03:16:38 2014
New Revision: 1612451
URL: http://svn.apache.org/r1612451
Log:
Rename website table to weblog, folder table to bookmark_folder.
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/createdb.vm
roller/trunk/app/src/main/resources/sql/macros.vm
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml?rev=1612451&r1=1612450&r2=1612451&view=diff
==
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
Tue Jul 22 03:16:38 2014
@@ -5,7 +5,7 @@
org.apache.roller.weblogger.pojos
-
+
SELECT w FROM Weblog w WHERE w.handle =
?1
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml?rev=1612451&r1=1612450&r2=1612451&view=diff
==
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
Tue Jul 22 03:16:38 2014
@@ -5,7 +5,7 @@
org.apache.roller.weblogger.pojos
-
+
SELECT f FROM WeblogBookmarkFolder f WHERE f.weblog =
?1
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=1612451&r1=1612450&r2=1612451&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 Tue Jul 22
03:16:38 2014
@@ -4,6 +4,9 @@
DON'T RUN THIS, IT'S NOT A DATABASE CREATION SCRIPT!!!
**#
+#renameTable('website' 'weblog')
+#renameTable('folder' 'bookmark_folder')
+
create table custom_template_rendition (
id varchar(48) not null primary key,
templateid varchar(48) not null,
@@ -41,18 +44,18 @@ delete from pingtarget where websiteid i
#dropColumn("pingtarget" "websiteid")
-- NOTE: you might need to drop this index on some Roller databases
--- drop index folder_namefolderid_uq on folder;
+-- drop index folder_namefolderid_uq on bookmark_folder;
-- Removal of bookmark subfolders and renaming of former root folder to
'default'
--- If a folder with name 'default' already exists, rename it by adding its id
to it.
-update folder set name = #concat("name" "id") where name = 'default';
-update folder set name = 'default' where name = 'root' and parentid is null;
-#dropColumn("folder" 'parentid')
-#dropColumn("folder" 'path')
-#dropColumn("folder" "description")
+-- If a bookmark folder with name 'default' already exists, rename it by
adding its id to it.
+update bookmark_folder set name = #concat("name" "id") where name = 'default';
+update bookmark_folder set name = 'default' where name = 'root' and parentid
is null;
+#dropColumn("bookmark_folder" 'parentid')
+#dropColumn("bookmark_folder" 'path')
+#dropColumn("bookmark_folder" "description")
#dropColumn("bookmark" "weight")
--- Removal of bookmark subfolders and renaming of former root folder to
'default'
+-- Removal of media file subfolders and renaming of former root folder to
'default'
-- If a folder with name 'default' already exists, rename it by adding its id
to it.
update roller_mediafiledir set name = #concat("name" "id") where name =
'default';
update roller_mediafiledir set name = 'default' where name = 'root' and
parentid is null;
@@ -61,7 +64,7 @@ update roller_mediafiledir set name = 'd
#dropColumn("roller_mediafiledir" "parentid")
-- Adding blog-specific web analytics (e.g. Google Analytics) tracking code
-#addColumnNull("website" "analyticscode" $db.TEXT_SQL_TYPE)
+#addColumnNull("weblog" "analyticscode" $db.TEXT_SQL_TYPE)
-- 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
Modified: roller/trunk/app/src/main/resources/sql/createdb.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app
[jira] [Commented] (ROL-2030) Replace Xinha editor with something more recent
[ https://issues.apache.org/jira/browse/ROL-2030?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14069582#comment-14069582 ] Glen Mazza commented on ROL-2030: - Actually, spoke with James of the Xinha team -- he said it's common to just pull the latest SVN version (which has had some updates since its last 2010 release). > Replace Xinha editor with something more recent > --- > > Key: ROL-2030 > URL: https://issues.apache.org/jira/browse/ROL-2030 > Project: Apache Roller > Issue Type: Task > Components: User Interface - Weblog Editor >Affects Versions: 5.1 >Reporter: Glen Mazza >Priority: Minor > > Present Xinha editor is 0.95 from 2008, 0.96.1 from 2010 is available: > http://trac.xinha.org/wiki/DownloadsPage. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Comment Edited] (ROL-2030) Replace Xinha editor with something more recent
[ https://issues.apache.org/jira/browse/ROL-2030?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14069340#comment-14069340 ] Glen Mazza edited comment on ROL-2030 at 7/22/14 12:24 AM: --- The Xinha download page isn't working, at least for downloading the latest 0.96.1. CKEditor appears to be the main RTE today, however it is Mozilla Public License (weak-copyleft), which Apache requires that we distribute only in binary form if we're to use it: http://www.apache.org/legal/resolved.html#category-b. However CKEditor is virtually all JavaScript and hence must be distributed in source form, i.e., we can't use it. A few forks of wysihtml5 (https://github.com/schnawel007/bootstrap3-wysihtml5, https://github.com/Waxolunist/bootstrap3-wysihtml5-bower, http://jhollingworth.github.io/bootstrap-wysihtml5/) use an Apache-friendly license (MIT) and modern technologies, even if supported only by a few people. As of now, that may be the best/only alternative for us if we wish to update Xinha. was (Author: gmazza): The Xinha download page isn't working, at least for downloading the latest 0.96.1. It hasn't been updated since 2010 anyway. CKEditor appears to be the main RTE today, however it is Mozilla Public License (weak-copyleft), which Apache requires that we distribute only in binary form if we're to use it: http://www.apache.org/legal/resolved.html#category-b. However CKEditor is virtually all JavaScript and hence must be distributed in source form, i.e., we can't use it. A few forks of wysihtml5 (https://github.com/schnawel007/bootstrap3-wysihtml5, https://github.com/Waxolunist/bootstrap3-wysihtml5-bower, http://jhollingworth.github.io/bootstrap-wysihtml5/) use an Apache-friendly license (MIT) and modern technologies, even if supported only by a few people. As of now, that may be the best/only alternative for us if we wish to update Xinha. > Replace Xinha editor with something more recent > --- > > Key: ROL-2030 > URL: https://issues.apache.org/jira/browse/ROL-2030 > Project: Apache Roller > Issue Type: Task > Components: User Interface - Weblog Editor >Affects Versions: 5.1 >Reporter: Glen Mazza >Priority: Minor > > Present Xinha editor is 0.95 from 2008, 0.96.1 from 2010 is available: > http://trac.xinha.org/wiki/DownloadsPage. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (ROL-2030) Replace Xinha editor with something more recent
[ https://issues.apache.org/jira/browse/ROL-2030?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Glen Mazza updated ROL-2030: Assignee: (was: Glen Mazza) > Replace Xinha editor with something more recent > --- > > Key: ROL-2030 > URL: https://issues.apache.org/jira/browse/ROL-2030 > Project: Apache Roller > Issue Type: Task > Components: User Interface - Weblog Editor >Affects Versions: 5.1 >Reporter: Glen Mazza >Priority: Minor > > Present Xinha editor is 0.95 from 2008, 0.96.1 from 2010 is available: > http://trac.xinha.org/wiki/DownloadsPage. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (ROL-2030) Replace Xinha editor with something more recent
[ https://issues.apache.org/jira/browse/ROL-2030?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Glen Mazza updated ROL-2030: Summary: Replace Xinha editor with something more recent (was: Update Xinha editor) > Replace Xinha editor with something more recent > --- > > Key: ROL-2030 > URL: https://issues.apache.org/jira/browse/ROL-2030 > Project: Apache Roller > Issue Type: Task > Components: User Interface - Weblog Editor >Affects Versions: 5.1 >Reporter: Glen Mazza >Assignee: Glen Mazza >Priority: Minor > > Present Xinha editor is 0.95 from 2008, 0.96.1 from 2010 is available: > http://trac.xinha.org/wiki/DownloadsPage. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (ROL-2030) Update Xinha editor
[ https://issues.apache.org/jira/browse/ROL-2030?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14069340#comment-14069340 ] Glen Mazza commented on ROL-2030: - The Xinha download page isn't working, at least for downloading the latest 0.96.1. It hasn't been updated since 2010 anyway. CKEditor appears to be the main RTE today, however it is Mozilla Public License (weak-copyleft), which Apache requires that we distribute only in binary form if we're to use it: http://www.apache.org/legal/resolved.html#category-b. However CKEditor is virtually all JavaScript and hence must be distributed in source form, i.e., we can't use it. A few forks of wysihtml5 (https://github.com/schnawel007/bootstrap3-wysihtml5, https://github.com/Waxolunist/bootstrap3-wysihtml5-bower, http://jhollingworth.github.io/bootstrap-wysihtml5/) use an Apache-friendly license (MIT) and modern technologies, even if supported only by a few people. As of now, that may be the best/only alternative for us if we wish to update Xinha. > Update Xinha editor > --- > > Key: ROL-2030 > URL: https://issues.apache.org/jira/browse/ROL-2030 > Project: Apache Roller > Issue Type: Task > Components: User Interface - Weblog Editor >Affects Versions: 5.1 >Reporter: Glen Mazza >Assignee: Glen Mazza >Priority: Minor > > Present Xinha editor is 0.95 from 2008, 0.96.1 from 2010 is available: > http://trac.xinha.org/wiki/DownloadsPage. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Assigned] (ROL-2030) Update Xinha editor
[ https://issues.apache.org/jira/browse/ROL-2030?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Glen Mazza reassigned ROL-2030: --- Assignee: Glen Mazza (was: Roller Unassigned) > Update Xinha editor > --- > > Key: ROL-2030 > URL: https://issues.apache.org/jira/browse/ROL-2030 > Project: Apache Roller > Issue Type: Task > Components: User Interface - Weblog Editor >Affects Versions: 5.1 >Reporter: Glen Mazza >Assignee: Glen Mazza >Priority: Minor > > Present Xinha editor is 0.95 from 2008, 0.96.1 from 2010 is available: > http://trac.xinha.org/wiki/DownloadsPage. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Resolved] (ROL-1554) Listing Box "Invite a new user to join..." does not have a horizontal scrolling bar
[ https://issues.apache.org/jira/browse/ROL-1554?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Glen Mazza resolved ROL-1554. - Resolution: Fixed Difficult to activate horizontal scrollbar as data is populated via Ajax; however, I expanded its width 25% to cover all but the longest possible names and email addresses. > Listing Box "Invite a new user to join..." does not have a horizontal > scrolling bar > --- > > Key: ROL-1554 > URL: https://issues.apache.org/jira/browse/ROL-1554 > Project: Apache Roller > Issue Type: Bug > Components: User Interface - Weblog Editor >Affects Versions: 4.0 > Environment: glassfish - winXP >Reporter: Davis Nguyen >Assignee: Glen Mazza > > The Listing Box "Invite a new user to join this weblog" does not have a > horizontal scrolling bar > STEPS TO REPRODUCE: > 1. Install Glassfish V2 server build 58c > 2. Install Roller M1 b04 build > 3. Start Roller > Register an admin user > create a Weblog and a web log entry > 4. Register another user as listed below: > Username: ThisIsATestForGroupBlog > Password: test > Password (confirm) test > Screen name: grouptest > Full Name: Group Test > Email: glassfish.apache.roller.java@sun.com > 5. Go to Preferences tab > Members > Invite New Member > BUG: > Can not view the user "ThisIsATestForGroupBlog" email alias > > -- This message was sent by Atlassian JIRA (v6.2#6252)
svn commit: r1612395 - in /roller/trunk/app/src/main/webapp/WEB-INF/jsps: admin/UserAdmin.jsp editor/MembersInvite.jsp
Author: gmazza Date: Mon Jul 21 20:30:28 2014 New Revision: 1612395 URL: http://svn.apache.org/r1612395 Log: ROL-1554 increase width of user list boxes. Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp?rev=1612395&r1=1612394&r2=1612395&view=diff == --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp Mon Jul 21 20:30:28 2014 @@ -37,7 +37,7 @@ style="margin:4px" /> +style="width:400px; margin:4px" > Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp?rev=1612395&r1=1612394&r2=1612395&view=diff == --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp Mon Jul 21 20:30:28 2014 @@ -42,7 +42,7 @@ - +
[jira] [Assigned] (ROL-1554) Listing Box "Invite a new user to join..." does not have a horizontal scrolling bar
[ https://issues.apache.org/jira/browse/ROL-1554?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Glen Mazza reassigned ROL-1554: --- Assignee: Glen Mazza (was: Roller Unassigned) > Listing Box "Invite a new user to join..." does not have a horizontal > scrolling bar > --- > > Key: ROL-1554 > URL: https://issues.apache.org/jira/browse/ROL-1554 > Project: Apache Roller > Issue Type: Bug > Components: User Interface - Weblog Editor >Affects Versions: 4.0 > Environment: glassfish - winXP >Reporter: Davis Nguyen >Assignee: Glen Mazza > > The Listing Box "Invite a new user to join this weblog" does not have a > horizontal scrolling bar > STEPS TO REPRODUCE: > 1. Install Glassfish V2 server build 58c > 2. Install Roller M1 b04 build > 3. Start Roller > Register an admin user > create a Weblog and a web log entry > 4. Register another user as listed below: > Username: ThisIsATestForGroupBlog > Password: test > Password (confirm) test > Screen name: grouptest > Full Name: Group Test > Email: glassfish.apache.roller.java@sun.com > 5. Go to Preferences tab > Members > Invite New Member > BUG: > Can not view the user "ThisIsATestForGroupBlog" email alias > > -- This message was sent by Atlassian JIRA (v6.2#6252)
