Author: gmazza
Date: Wed Jul 23 00:46:09 2014
New Revision: 1612733
URL: http://svn.apache.org/r1612733
Log:
Retired weblog export functionality in favor of HTML export described on our
team Wiki.
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp
Modified:
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Jul
23 00:46:09 2014
@@ -1234,7 +1234,6 @@ tabbedmenu.website.pages=Templates
tabbedmenu.website.members=Members
tabbedmenu.website.maintenance=Maintenance
tabbedmenu.weblog.pingSetup=Pings
-tabbedmenu.weblog.export=Export
tabbedmenu.weblog.mediaFiles=Media Files
@@ -1316,26 +1315,6 @@ uploadFiles.uploadedFile={0}
uploadFiles.error.badPath=The path [{0}] is invalid. Paths may not contain
"/", "\\", or ".."
uploadFiles.error.upload=Upload failed for [{0}]
-# -----------------------------------------------------------------------
Export
-
-weblogExport.title=Export Weblog
-weblogExport.subtitle=Export the weblog <span>{0}</span>
-weblogExport.tip=Exporting your weblog is great for locally backing up your \
- entries, comments and uploaded files.
-
-weblogExport.entries=Entries
-weblogExport.entries.tip=Export all of your entries and comments in the \
- Moveable Type import format. This format can also be used with WordPress. \
- You may optionally define a new base URL for all of your referenced \
- resource files.
-weblogExport.baseUrl=Base Resource URL (Optional):
-weblogExport.exportEntries=Export Entries
-
-weblogExport.resources=Resources
-weblogExport.resources.tip=Export all of your uploaded resource files as a \
- convenient ZIP archive.
-weblogExport.exportResources=Export Resources
-
# ------------------------------------------------------------------- User
admin
userAdmin.title.searchUser=Find user to edit
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Wed
Jul 23 00:46:09 2014
@@ -657,7 +657,6 @@ tabbedmenu.planet=Planet
tabbedmenu.weblog=Weblog
tabbedmenu.weblog.archives=Archiv
tabbedmenu.weblog.categories=Kategorien
-tabbedmenu.weblog.export=Export
tabbedmenu.weblog.newEntry=Neuer Eintrag
tabbedmenu.weblog.pingSetup=Pings
tabbedmenu.website=Webseite
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Wed
Jul 23 00:46:09 2014
@@ -393,7 +393,6 @@ tabbedmenu.website.pages=Plantilla
tabbedmenu.website.members=Miembros
tabbedmenu.website.maintenance=Mantenimiento
tabbedmenu.weblog.pingSetup=Pings
-tabbedmenu.weblog.export=Exportar
tabbedmenu.admin=Administraci\u00F3n global
tabbedmenu.admin.config=Configuraci\u00F3n
tabbedmenu.admin.userAdmin=Administraci\u00F3n de usuarios
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Wed
Jul 23 00:46:09 2014
@@ -811,7 +811,6 @@ tabbedmenu.website.pages=Modèles
tabbedmenu.website.members=Membres
tabbedmenu.website.maintenance=Maintenance
tabbedmenu.weblog.pingSetup=Notifications
-tabbedmenu.weblog.export=Exporter
tabbedmenu.admin=Admin. Serveur
tabbedmenu.admin.config=Configuration
Modified:
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
Wed Jul 23 00:46:09 2014
@@ -606,7 +606,6 @@ tabbedmenu.website.themes=\u30C6\u30FC\u
tabbedmenu.website.pages=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
tabbedmenu.website.members=\u30E1\u30F3\u30D0
tabbedmenu.website.maintenance=\u30E1\u30F3\u30C6\u30CA\u30F3\u30B9
-tabbedmenu.weblog.export=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
tabbedmenu.admin=\u30B5\u30FC\u30D0\u7BA1\u7406
tabbedmenu.admin.config=\u30B5\u30A4\u30C8\u8A2D\u5B9A
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Wed
Jul 23 00:46:09 2014
@@ -885,7 +885,6 @@ tabbedmenu.website.pages=\ud15c\ud50c\ub
tabbedmenu.website.members=\uba64\ubc84
tabbedmenu.website.maintenance=\uc720\uc9c0\ubcf4\uc218
tabbedmenu.weblog.pingSetup=\uc5f0\uacb0\ud655\uc778
-tabbedmenu.weblog.export=\ub0b4\ubcf4\ub0b4\uae30
tabbedmenu.admin=\uc11c\ubc84 \uad00\ub9ac\uc790
tabbedmenu.admin.config=\ud658\uacbd \uc124\uc815
tabbedmenu.admin.userAdmin=\uc0ac\uc6a9\uc790 \uad00\ub9ac\uc790
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Wed
Jul 23 00:46:09 2014
@@ -542,7 +542,6 @@ tabbedmenu.website.pages=\u0428\u0430\u0
tabbedmenu.website.members=\u0423\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0438
tabbedmenu.website.maintenance=\u041e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u0435
tabbedmenu.weblog.pingSetup=\u041f\u0438\u043d\u0433\u0438
-tabbedmenu.weblog.export=\u042d\u043a\u0441\u043f\u043e\u0440\u0442
tabbedmenu.admin=Global Admin
tabbedmenu.admin.config=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
tabbedmenu.admin.userAdmin=User Admin
Modified:
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
Wed Jul 23 00:46:09 2014
@@ -401,7 +401,6 @@ tabbedmenu.planet=\u884c\u661f\u7ba1\u74
tabbedmenu.weblog=\u7f51\u5fd7\u7ba1\u7406
tabbedmenu.weblog.archives=\u5f52\u6863
tabbedmenu.weblog.categories=\u5206\u7c7b
-tabbedmenu.weblog.export=\u5bfc\u51fa
tabbedmenu.weblog.newEntry=\u64b0\u5199\u65b0\u65e5\u5fd7
tabbedmenu.weblog.pingSetup=Pings
tabbedmenu.website=\u4e2a\u6027\u5b9a\u5236
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Wed Jul 23 00:46:09 2014
@@ -646,9 +646,5 @@ eclipselink.persistence-context.flush-mo
# Experimental, deprecated and "undocumented" settings
#-----------------------------------------------------------------------------
-# Enable an Export page that allows users to export entries and media files
-# for a format that is compatible with Movable Type and Wordpress.
-weblog.export.enabled=false
-
# Allow users to edit the original path setting of media files
mediafile.originalPathEdit.enabled=false
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
Wed Jul 23 00:46:09 2014
@@ -63,13 +63,6 @@ Each menu or menu item is governed by fo
weblogPerms="post"
subactions="mediaFileAdd,mediaFileSearch" />
- <!-- globalPerms="login" -->
- <menu-item action="weblogExport"
- enabledProperty="weblog.export.enabled"
- name="tabbedmenu.weblog.export"
- weblogPerms="admin"
- subactions="exportEntries,exportResources"/>
-
</menu>
<!-- if we already have checked weblogPerms="admin" globalPerms="login"
we should -->
Modified: roller/trunk/app/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/struts.xml?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/struts.xml (original)
+++ roller/trunk/app/src/main/resources/struts.xml Wed Jul 23 00:46:09 2014
@@ -431,12 +431,6 @@
</action>
-->
- <action name="weblogExport!*" method="{1}"
-
class="org.apache.roller.weblogger.ui.struts2.editor.WeblogExport">
- <result name="input" type="tiles">.WeblogExport</result>
- <!--<result name="success" type="chain">weblogExport</result>-->
- </action>
-
<action name="weblogConfig!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.editor.WeblogConfig">
<result name="input" type="tiles">.WeblogConfig</result>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml?rev=1612733&r1=1612732&r2=1612733&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml Wed Jul 23 00:46:09 2014
@@ -379,10 +379,6 @@
<put-attribute name="content"
value="/WEB-INF/jsps/editor/Resources.jsp" />
</definition>
- <definition name=".WeblogExport" extends=".tiles-tabbedpage" >
- <put-attribute name="content"
value="/WEB-INF/jsps/editor/WeblogExport.jsp" />
- </definition>
-
<!-- weblog admin pages (and associates) -->
<definition name=".WeblogConfig" extends=".tiles-tabbedpage" >
<put-attribute name="content"
value="/WEB-INF/jsps/editor/WeblogConfig.jsp" />
