You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2014/06/08 22:23:36 UTC
svn commit: r1601254 [4/4] - in /roller/branches/rome2: ./ app/
app/src/main/java/org/apache/roller/util/
app/src/main/java/org/apache/roller/weblogger/business/
app/src/main/java/org/apache/roller/weblogger/business/jpa/
app/src/main/java/org/apache/r...
Modified: roller/branches/rome2/app/src/main/resources/sql/createdb.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/createdb.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/sql/createdb.vm (original)
+++ roller/branches/rome2/app/src/main/resources/sql/createdb.vm Sun Jun 8 20:23:32 2014
@@ -133,7 +133,8 @@ create table website (
showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null,
customstylesheet varchar(128),
about varchar(255),
- icon varchar(255)
+ icon varchar(255),
+ analyticscode $db.TEXT_SQL_TYPE
);
create index ws_isenabled_idx on website(isenabled);
alter table website add constraint ws_handle_uq unique (handle$!db.INDEXSIZE);
@@ -142,7 +143,7 @@ alter table website add constraint ws_ha
-- create index ws_handle_idx on website(handle);
-create table rol_weblogtheme (
+create table roller_weblogtheme (
id varchar(48) not null primary key,
weblogid varchar(48) not null,
name varchar(255) not null,
@@ -150,7 +151,7 @@ create table rol_weblogtheme (
#columnNotNullWithDefault('type' 'varchar(16)' 'standard')
);
-create table rol_templatecode (
+create table roller_templatecode (
id varchar(48) not null primary key,
templateid varchar(48) not null,
template $db.TEXT_SQL_TYPE not null,
@@ -316,32 +317,6 @@ create index pqe_entrytime_idx on pingqu
create index pqe_pingtid_idx on pingqueueentry( pingtargetid );
create index pqe_websiteid_idx on pingqueueentry( websiteid );
-
--- Referer tracks URLs that refer to websites and entries
-create table referer (
- id varchar(48) not null primary key,
- websiteid varchar(48) not null,
- entryid varchar(48),
- datestr varchar(10),
- refurl varchar(255) not null,
- refpermalink varchar(255),
- reftime $db.TIMESTAMP_SQL_TYPE,
- requrl varchar(255),
- title varchar(255),
- excerpt $db.TEXT_SQL_TYPE,
- dayhits integer default 0 not null,
- totalhits integer default 0 not null,
- visible $db.BOOLEAN_SQL_TYPE_FALSE not null,
- duplicate $db.BOOLEAN_SQL_TYPE_FALSE not null
-);
-create index ref_websiteid_idx on referer( websiteid );
-create index ref_entryid_idx on referer( entryid );
-create index ref_refurl_idx on referer( refurl$!db.INDEXSIZE );
-create index ref_requrl_idx on referer( requrl$!db.INDEXSIZE );
-create index ref_datestr_idx on referer( datestr );
-create index ref_refpermlnk_idx on referer( refpermalink$!db.INDEXSIZE );
-create index ref_duplicate_idx on referer( duplicate );
-
create table roller_properties (
name varchar(255) not null primary key,
value $db.TEXT_SQL_TYPE
@@ -504,9 +479,7 @@ create table roller_mediafiledir (
id varchar(48) not null primary key,
name varchar(255) not null,
description varchar(255),
- websiteid varchar(48) not null,
- parentid varchar(48),
- path varchar(255)
+ websiteid varchar(48) not null
);
@@ -535,14 +508,6 @@ alter table roller_comment add constrain
alter table entryattribute add constraint att_entryid_fk
foreign key ( entryid ) references weblogentry( id ) $!db.ADDL_FK_PARAMS ;
--- referer
-
-alter table referer add constraint ref_entryid_fk
- foreign key ( entryid ) references weblogentry( id ) $!db.ADDL_FK_PARAMS ;
-
-alter table referer add constraint ref_websiteid_fk
- foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
-
-- folder and bookmark
alter table folder add constraint fo_websiteid_fk
@@ -562,9 +527,6 @@ alter table roller_mediafiletag add cons
alter table roller_mediafiledir add constraint mf_websiteid_fk
foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
-alter table roller_mediafiledir add constraint mf_parentid_fk
- foreign key ( parentid ) references roller_mediafiledir( id ) $!db.ADDL_FK_PARAMS ;
-
-- newsfeed
alter table newsfeed add constraint nf_websiteid_fk
Modified: roller/branches/rome2/app/src/main/resources/sql/droptables.sql
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/droptables.sql?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/sql/droptables.sql (original)
+++ roller/branches/rome2/app/src/main/resources/sql/droptables.sql Sun Jun 8 20:23:32 2014
@@ -33,7 +33,6 @@ drop table roller_tasklock;
drop table pingqueueentry;
drop table autoping;
drop table pingtarget;
-drop table referer;
drop table bookmark;
drop table folder;
drop table roller_userattribute;
@@ -51,8 +50,8 @@ drop table entryattribute;
drop table weblogentry;
drop table weblogcategory;
drop table webpage;
-drop table rol_weblogtheme;
-drop table rol_templatecode;
+drop table roller_weblogtheme;
+drop table roller_templatecode;
-- core platform tables
drop table roller_permission;
Modified: roller/branches/rome2/app/src/main/resources/sql/macros.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/macros.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/sql/macros.vm (original)
+++ roller/branches/rome2/app/src/main/resources/sql/macros.vm Sun Jun 8 20:23:32 2014
@@ -89,7 +89,7 @@ Macro to account for lack of comparable
#macro(longtext $size) #if($db.DBTYPE == "MYSQL") text #else varchar($size) #end #end
-#macro(dropIndex $indexName $tableName)
+#macro(dropIndex $tableName $indexName)
#if ($db.DBTYPE == "DERBY" || $db.DBTYPE == 'POSTGRESQL')
drop index $indexName;
#elseif ($db.DBTYPE == "MYSQL")
Modified: roller/branches/rome2/app/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/struts.xml?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/struts.xml (original)
+++ roller/branches/rome2/app/src/main/resources/struts.xml Sun Jun 8 20:23:32 2014
@@ -1,6 +1,6 @@
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
- "http://struts.apache.org/dtds/struts-2.0.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
+ "http://struts.apache.org/dtds/struts-2.3.dtd">
<struts>
<!-- Weblogger default package -->
@@ -42,15 +42,19 @@
<!-- <interceptor-ref name="staticParams"/> -->
<interceptor-ref name="actionMappingParams"/>
<interceptor-ref name="params">
- <param name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
+ <param name="excludeParams">(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="conversionError"/>
<!-- custom Roller interceptors -->
- <interceptor-ref name="UIActionInterceptor"/>
- <interceptor-ref name="UISecurityInterceptor"/>
+ <interceptor-ref name="UIActionInterceptor">
+ <param name="excludeMethods">cancel</param>
+ </interceptor-ref>
+ <interceptor-ref name="UISecurityInterceptor">
+ <param name="excludeMethods">cancel</param>
+ </interceptor-ref>
<interceptor-ref name="UIActionPrepareInterceptor">
- <param name="excludeMethods">input,back,cancel,browse</param>
+ <param name="excludeMethods">cancel</param>
</interceptor-ref>
<!-- validation interceptors, MUST come after our custom interceptors -->
@@ -437,13 +441,7 @@
<result name="input" type="tiles">.WeblogExport</result>
<!--<result name="success" type="chain">weblogExport</result>-->
</action>
-
- <action name="referrers!*" method="{1}"
- class="org.apache.roller.weblogger.ui.struts2.editor.Referrers">
- <result name="list" type="tiles">.Referrers</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/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Sun Jun 8 20:23:32 2014
@@ -77,7 +77,6 @@ function onMove()
<s:hidden name="folderId" />
<s:if test="!allFolders.isEmpty">
-
<%-- View button --%>
<s:submit type="button" action="bookmarks!view" key="bookmarksForm.viewFolder" />
@@ -85,7 +84,6 @@ function onMove()
<s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name" />
<br /><br />
-
</s:if>
<table class="rollertable">
Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp Sun Jun 8 20:23:32 2014
@@ -70,7 +70,7 @@
<s:form id="entry" action="mediaFileAdd!save" method="POST" enctype="multipart/form-data">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:hidden name="directoryPath" />
+ <s:hidden name="directoryName" />
<%-- ================================================================== --%>
<%-- Title, category, dates and other metadata --%>
@@ -118,7 +118,7 @@
<label for="status"><s:text name="mediaFileAdd.directory" /></label>
</td>
<td>
- <s:select name="bean.directoryId" list="allDirectories" listKey="id" listValue="path" />
+ <s:select name="bean.directoryId" list="allDirectories" listKey="id" listValue="name" />
</td>
</tr>
Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp Sun Jun 8 20:23:32 2014
@@ -161,7 +161,7 @@
<li>
<s:url id="mediaFileAddURL" action="mediaFileAdd">
<s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="directoryPath" value="%{directoryPath}" />
+ <s:param name="directoryName" value="%{directoryName}" />
</s:url>
<s:a href="%{mediaFileAddURL}">
<s:text name="mediaFileSuccess.addAnother" />
Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp Sun Jun 8 20:23:32 2014
@@ -166,7 +166,7 @@ $("#d_clip_button").ready(function() {
</td>
<td>
<s:select name="bean.directoryId" list="allDirectories"
- listKey="id" listValue="path" tabindex="5" />
+ listKey="id" listValue="name" tabindex="5" />
</td>
</tr>
@@ -192,7 +192,7 @@ $("#d_clip_button").ready(function() {
</td>
</tr>
- <!-- orginal path from base URL of ctx/resources/ -->
+ <!-- original path from base URL of ctx/resources/ -->
<% if (WebloggerConfig.getBooleanProperty("mediafile.originalPathEdit.enabled")) { %>
<tr>
<td class="originalPathLabel">
Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp Sun Jun 8 20:23:32 2014
@@ -61,7 +61,7 @@
<%-- Subtitle and folder path --%>
-<s:if test='currentDirectory.path.equals("/")'>
+<s:if test='currentDirectory.name.equals("default")'>
<p class="subtitle">
<s:text name="mediaFileImageChooser.subtitle" >
@@ -78,10 +78,10 @@
<s:else>
<p class="subtitle">
- <s:text name="mediaFileView.path"/> /
+ <s:text name="mediaFileView.folderName"/> /
<s:iterator id="directory" value="currentDirectoryHierarchy">
<s:url id="getDirectoryByPathUrl" action="mediaFileImageChooser">
- <s:param name="directoryPath" value="#directory.key" />
+ <s:param name="directoryName" value="#directory.key" />
<s:param name="weblog" value="%{actionWeblog.handle}" />
</s:url>
<s:a href="%{getDirectoryByPathUrl}"><s:property value="#directory.value" /></s:a> /
Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp Sun Jun 8 20:23:32 2014
@@ -30,7 +30,7 @@
<img src='<s:url value="/images/image_add.png"/>' border="0"alt="icon" />
<s:url id="mediaFileAddURL" action="mediaFileAdd">
<s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="directoryPath" value="%{directoryPath}" />
+ <s:param name="directoryName" value="%{directoryName}" />
</s:url>
<a href='<s:property escape="false" value="%{mediaFileAddURL}" />'
<s:if test="actionName.equals('mediaFileAdd')">style='font-weight:bold;'</s:if> >
Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp Sun Jun 8 20:23:32 2014
@@ -68,11 +68,28 @@
<script type="text/javascript">
+ toggleState = 'Off'
function onSelectDirectory(id) {
window.location = "<s:url action="mediaFileView" />?directoryId=" + id + "&weblog=" + '<s:property value="actionWeblog.handle" />';
}
+ function onToggle() {
+ if (toggleState == 'Off') {
+ toggleState = 'On';
+ toggleFunction(true, 'selectedMediaFiles');
+ $("#deleteButton").attr('disabled',false)
+ $("#moveButton").attr('disabled',false)
+ $("#moveTargetMenu").attr('disabled',false)
+ } else {
+ toggleState = 'Off';
+ toggleFunction(false, 'selectedMediaFiles');
+ $("#deleteButton").attr('disabled',true)
+ $("#moveButton").attr('disabled',true)
+ $("#moveTargetMenu").attr('disabled',true)
+ }
+ }
+
function onDeleteSelected() {
if ( confirm("<s:text name='mediaFile.delete.confirm' />") ) {
document.mediaFileViewForm.action='<s:url action="mediaFileView!deleteSelected" />';
@@ -80,6 +97,13 @@
}
}
+ function onDeleteFolder() {
+ if (confirm("<s:text name='mediaFile.deleteFolder.confirm' />")) {
+ document.bookmarks.action='<s:url action="mediaFileView!deleteFolder" />';
+ document.bookmarks.submit();
+ }
+ }
+
function onMoveSelected() {
if ( confirm("<s:text name='mediaFile.move.confirm' />") ) {
document.mediaFileViewForm.action='<s:url action="mediaFileView!moveSelected" />';
@@ -193,7 +217,7 @@
<%-- Subtitle and folder path --%>
-<s:if test='currentDirectory.path.equals("/")'>
+<s:if test='currentDirectory.name.equals("default")'>
<p class="subtitle">
<s:text name="mediaFileView.subtitle" >
@@ -267,16 +291,7 @@
<s:else>
<p class="subtitle">
- <s:text name="mediaFileView.path"/> /
- <s:iterator id="directory" value="currentDirectoryHierarchy">
-
- <s:url id="getDirectoryByPathUrl" action="mediaFileView">
- <s:param name="directoryPath" value="#directory.key" />
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- </s:url>
- <s:a href="%{getDirectoryByPathUrl}"><s:property value="#directory.value" /></s:a> /
-
- </s:iterator>
+ <s:text name="mediaFileView.name"/>: <s:text name="currentDirectory.name" />
</p>
<p class="pagetip">
<s:text name="mediaFileView.dirPageTip" />
@@ -285,7 +300,7 @@
</s:else>
-<s:if test="childFiles || childDirectories || (pager && pager.items.size() > 0)">
+<s:if test="childFiles || (pager && pager.items.size() > 0)">
<s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView">
<s:hidden name="salt" />
@@ -295,8 +310,7 @@
<input type="hidden" name="mediaFileId" value="" />
<div class="control">
-
- <span style="padding-left:20px">
+ <span style="padding-left:7px">
<s:text name="mediaFileView.sortby" />
<s:select id="sortByMenu" name="sortBy" list="sortOptions" listKey="key"
listValue="value"
@@ -304,18 +318,17 @@
</span>
<span style="float:right">
- <input id="deleteButton" type="button" style="padding-right:20px"
- value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()" />
+ <s:if test="!allDirectories.isEmpty">
+ <%-- View button --%>
+ <s:submit type="button" action="mediaFileView!view" key="mediaFileView.viewFolder" />
- <input id="moveButton" type="button" style="padding-left:20px"
- value=<s:text name="mediaFileView.moveSelected" /> onclick="onMoveSelected()" />
+ <%-- Folder to View combo-box --%>
+ <s:select name="viewDirectoryId" list="allDirectories" listKey="id" listValue="name" />
- <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" listValue="path" />
+ </s:if>
</span>
-
</div>
-
<%-- ***************************************************************** --%>
<%-- Media file folder contents --%>
@@ -339,32 +352,11 @@
<%-- NOT SEARCH RESULTS --%>
- <s:if test="childDirectories.size() == 0 && childFiles.size() ==0">
+ <s:if test="childFiles.size() ==0">
<p style="text-align: center"><s:text name="mediaFileView.noFiles"/></p>
</s:if>
- <%-- List media directories first --%>
-
- <s:iterator id="directory" value="childDirectories">
- <li class="align-images"
- onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
- <div class="mediaObject">
- <img border="0" src='<s:url value="/images/folder.png"/>'
- class="dir-image" alt="mediaFolder.png"
- onclick="onSelectDirectory('<s:property value="#directory.id"/>')"/>
- </div>
- <div class="mediaObjectInfo">
- <input type="checkbox"
- name="selectedMediaFileDirectories"
- value="<s:property value="#directory.id"/>"/>
- <inut type="hidden" id="mediadiridentity"
- value="<s:property value='#directory.id'/>">
- <s:property value="#directory.name" />
- </div>
- </li>
- </s:iterator>
-
- <%-- List media files next --%>
+ <%-- List media files --%>
<s:iterator id="mediaFile" value="childFiles">
@@ -475,6 +467,32 @@
<div style="clear:left;"></div>
+ <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0) || (currentDirectory.name != 'default' && !pager)">
+ <div class="control">
+
+ <span style="padding-left:7px">
+ <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0)">
+ <input id="toggleButton" type="button"
+ value='<s:text name="mediaFileView.toggleSelected" />' onclick="onToggle()" />
+
+ <input id="deleteButton" type="button"
+ value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()" />
+
+ <input id="moveButton" type="button"
+ value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()" />
+
+ <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" listValue="name" />
+ </s:if>
+ </span>
+
+ <s:if test="currentDirectory.name != 'default' && !pager">
+ <span style="float:right">
+ <s:submit value="%{getText('mediaFileView.deleteFolder')}" action="mediaFileView!deleteFolder" onclick="onDeleteFolder();return false;"/>
+ </span>
+ </s:if>
+ </div>
+ </s:if>
+
</s:form>
</s:if>
Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp Sun Jun 8 20:23:32 2014
@@ -235,6 +235,20 @@
<td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td>
</tr>
+
+ <%-- ***** Web analytics settings ***** --%>
+
+ <s:if test="getBooleanProp('analytics.code.override.allowed')">
+ <tr>
+ <td colspan="3"><h2><s:text name="configForm.webAnalytics" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="label"><s:text name="websiteSettings.analyticsTrackingCode" /></td>
+ <td class="field"><s:textarea name="bean.analyticsCode" rows="10" cols="70"/></td>
+ </tr>
+ </s:if>
+
<%-- ***** Global admin only settings ***** --%>
<s:if test="authenticatedUser.hasGlobalPermission('admin')">
<tr>
Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/tiles.xml?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/tiles.xml (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/tiles.xml Sun Jun 8 20:23:32 2014
@@ -386,10 +386,6 @@
<put-attribute name="content" value="/WEB-INF/jsps/editor/Resources.jsp" />
</definition>
- <definition name=".Referrers" extends=".tiles-tabbedpage" >
- <put-attribute name="content" value="/WEB-INF/jsps/editor/Referrers.jsp" />
- </definition>
-
<definition name=".WeblogExport" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/WeblogExport.jsp" />
</definition>
Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm Sun Jun 8 20:23:32 2014
@@ -24,6 +24,7 @@ These are the documented macros in order
#showAutodiscoveryLinks($weblog)
#showTrackbackAutodiscovery($entry)
#showMetaDescription()
+ #showAnalyticsTrackingCode($weblog)
#showWeblogEntriesPager($pager)
#showNextPrevEntriesControl($pager)
@@ -37,7 +38,6 @@ These are the documented macros in order
#showBookmarkLinksList($folderObj)
#showWeblogCategoryLinksList()
#showMobileCategoryLinksList()
- #showReferrersList($weblog)
#showAtomFeedsList($weblog)
#showRSSFeedsList($weblog)
@@ -155,6 +155,19 @@ will be created.
#end
#end
+#**
+Adds a tracking code for website analytics (e.g. Google Analytics). Will use the blog-defined
+tracking code if defined and permitted by the installation, else the server-defined tracking
+code if defined will be used.
+*#
+#macro(showAnalyticsTrackingCode $weblog)
+ #if ($config.analyticsOverrideAllowed && $utils.isNotEmpty($weblog.analyticsCode))
+ $weblog.analyticsCode
+ #elseif ($utils.isNotEmpty($config.defaultAnalyticsTrackingCode))
+ $config.defaultAnalyticsTrackingCode
+ #end
+#end
+
#**
Shows weblog entries pager via default day template
*#
@@ -566,49 +579,6 @@ Show weblog's categories in specified pa
<a href="#categories" data-rel="popup" data-role="button">Categories - $active</a>
#end
-#**
- * Display list of referrers.
- *#
-#macro(showReferrersList $refs $max $maxWidth $includeHits)
- <ul class="rReferersList">
- #foreach( $ref in $refs )
- #if ($velocityCount <= $max)
- <li class="rReferersListItem">
-
- #set( $qq = '"' )
- #set( $myUrl = $utils.escapeHTML( $ref.RefererUrl ) )
- #set( $displayUrl = $myUrl )
- #set( $restOfUrl = "" )
- #set( $displayLink = "" )
- #if ( $displayUrl.startsWith("http://") )
- #set( $displayUrl = $displayUrl.substring( 7 ) )
- #end
- #if ( $displayUrl.length() > $maxWidth )
- #set( $restOfUrl = "...$displayUrl.substring($maxWidth, $displayUrl.length())" )
- #set( $displayUrl = $displayUrl.substring(0, $maxWidth) )
- #end
- #if ( $myUrl.startsWith("http://") )
- #set( $displayLink = "<a rel=${qq}nofollow${qq} href=${qq}$myUrl${qq}" )
- #if ( $restOfUrl )
- #set( $displayLink = "$displayLink title=${qq}$restOfUrl${qq}" )
- #end
- #set( $displayLink = "$displayLink >" )
- #end
- #set( $displayLink = "$displayLink$displayUrl" )
- #if ( $includeHits )
- #set( $displayLink = "$displayLink ($ref.DayHits)" )
- #end
- #if ( $myUrl.startsWith("http://") )
- #set( $displayLink = "$displayLink</a>" )
- #end
- $displayLink
-
- </li>
- #end
- #end
- </ul>
-#end
-
#**
* Show list of all RSS feeds available for weblog.
Modified: roller/branches/rome2/app/src/main/webapp/theme/scripts/roller.js
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/theme/scripts/roller.js?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/theme/scripts/roller.js (original)
+++ roller/branches/rome2/app/src/main/webapp/theme/scripts/roller.js Sun Jun 8 20:23:32 2014
@@ -196,11 +196,7 @@ function toggleFunction(toggle,name) {;
var inputs = document.getElementsByName(name);
for(var i = 0; i < inputs.length ; i++) {
if(inputs[i].type == 'checkbox' && inputs[i].disabled == false) {
- if (inputs[i].checked == true){
- inputs[i].checked = !inputs[i].checked;
- } else{
- inputs[i].checked = toggle;
- }
+ inputs[i].checked = toggle;
}
}
};
\ No newline at end of file
Modified: roller/branches/rome2/app/src/main/webapp/themes/base.css
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/base.css?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/themes/base.css (original)
+++ roller/branches/rome2/app/src/main/webapp/themes/base.css Sun Jun 8 20:23:32 2014
@@ -1,20 +1,20 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License. For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
/* Common CSS */
@@ -119,21 +119,6 @@ span.rNewsfeedDesc {
font-weight: normal;
}
-/* referer.vm */
-
-ul.rReferersList {
- list-style: none;
- margin-left: 0;
- padding-left: 0;
-}
-li.rReferersListItem {
- font-size : small;
- font-weight: normal;
-}
-a.linkback {
- border-style: double;
-}
-
/* comments.vm */
a.entrycommentslink {
Modified: roller/branches/rome2/app/src/main/webapp/themes/basic/basic-custom.css
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/basic/basic-custom.css?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/themes/basic/basic-custom.css (original)
+++ roller/branches/rome2/app/src/main/webapp/themes/basic/basic-custom.css Sun Jun 8 20:23:32 2014
@@ -63,7 +63,7 @@ li.selected {
/* other lists ----------------------------------------------- */
-ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rEntriesList {
list-style-type: none;
padding: 0;
margin: 0;
Modified: roller/branches/rome2/app/src/main/webapp/themes/basic/sidebar.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/basic/sidebar.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/themes/basic/sidebar.vm (original)
+++ roller/branches/rome2/app/src/main/webapp/themes/basic/sidebar.vm Sun Jun 8 20:23:32 2014
@@ -30,9 +30,3 @@
#showPageMenu($model.weblog)
#showAuthorMenu(true)
</div>
-
- <h2>Referrers</h2>
- <div class="sidebar">
- #set($refs = $model.weblog.getTodaysReferrers())
- #showReferrersList($refs 30 20 true)
- </div>
Modified: roller/branches/rome2/app/src/main/webapp/themes/basic/weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/basic/weblog.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/themes/basic/weblog.vm (original)
+++ roller/branches/rome2/app/src/main/webapp/themes/basic/weblog.vm Sun Jun 8 20:23:32 2014
@@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
+ #showAnalyticsTrackingCode($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
#showMetaDescription()
</head>
Modified: roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css (original)
+++ roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css Sun Jun 8 20:23:32 2014
@@ -61,7 +61,7 @@ li.selected {
/* other lists ----------------------------------------------- */
-ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rEntriesList {
list-style-type: none;
padding: 0;
margin: 0;
Modified: roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/weblog.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/weblog.vm (original)
+++ roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/weblog.vm Sun Jun 8 20:23:32 2014
@@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
+ #showAnalyticsTrackingCode($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
#showMetaDescription()
</head>
Modified: roller/branches/rome2/app/src/main/webapp/themes/fauxcoly/weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/fauxcoly/weblog.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/themes/fauxcoly/weblog.vm (original)
+++ roller/branches/rome2/app/src/main/webapp/themes/fauxcoly/weblog.vm Sun Jun 8 20:23:32 2014
@@ -5,6 +5,7 @@
#includeTemplate($model.weblog "standard_head")
<title>$model.weblog.name: $model.weblog.description</title>
#showAutodiscoveryLinks($model.weblog)
+ #showAnalyticsTrackingCode($model.weblog)
<link rel="stylesheet" type="text/css" href='$url.page("custom.css")' />
#showMetaDescription()
</head>
Modified: roller/branches/rome2/app/src/main/webapp/themes/sotto/sotto-custom.css
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/sotto/sotto-custom.css?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/themes/sotto/sotto-custom.css (original)
+++ roller/branches/rome2/app/src/main/webapp/themes/sotto/sotto-custom.css Sun Jun 8 20:23:32 2014
@@ -71,7 +71,7 @@ li.selected {
/* other lists ----------------------------------------------- */
-ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rEntriesList {
list-style-type: none;
padding: 0;
margin: 0;
Modified: roller/branches/rome2/app/src/main/webapp/themes/sotto/weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/sotto/weblog.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/themes/sotto/weblog.vm (original)
+++ roller/branches/rome2/app/src/main/webapp/themes/sotto/weblog.vm Sun Jun 8 20:23:32 2014
@@ -6,6 +6,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
+ #showAnalyticsTrackingCode($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
#showMetaDescription()
</head>
Modified: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java (original)
+++ roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java Sun Jun 8 20:23:32 2014
@@ -43,11 +43,14 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.util.RollerMessages;
+import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.runners.MethodSorters;
/**
* Test media file related business operations.
*/
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class MediaFileTest extends TestCase {
public static Log log = LogFactory.getLog(MediaFileTest.class);
@@ -95,34 +98,28 @@ public class MediaFileTest extends TestC
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- // no need to create root directory, that is done automatically now
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
- // assertNotNull(rootDirectory.getId() != null);
-
TestUtils.endSession(true);
testWeblog = TestUtils.getManagedWebsite(testWeblog);
try {
- mfMgr.createMediaFileDirectoryByPath(testWeblog, "");
+ mfMgr.createMediaFileDirectory(testWeblog, "");
assertTrue(false);
} catch (WebloggerException e) {
assertTrue(true);
}
try {
- mfMgr.createMediaFileDirectoryByPath(testWeblog, "/");
+ mfMgr.createMediaFileDirectory(testWeblog, "default");
assertTrue(false);
} catch (WebloggerException e) {
assertTrue(true);
}
MediaFileDirectory newDirectory1 = mfMgr
- .createMediaFileDirectoryByPath(testWeblog, "/test1");
+ .createMediaFileDirectory(testWeblog, "test1");
MediaFileDirectory newDirectory2 = mfMgr
- .createMediaFileDirectoryByPath(testWeblog, "/test2/");
+ .createMediaFileDirectory(testWeblog, "test2");
TestUtils.endSession(true);
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -137,39 +134,14 @@ public class MediaFileTest extends TestC
// show throw error when creating directory that already exists
try {
- mfMgr.createMediaFileDirectoryByPath(testWeblog, "test1");
+ mfMgr.createMediaFileDirectory(testWeblog, "test1");
assertTrue(false);
} catch (WebloggerException e) {
assertTrue(true);
}
- MediaFileDirectory newDirectory3 = mfMgr
- .createMediaFileDirectoryByPath(testWeblog, "/test1/test2");
- TestUtils.endSession(true);
-
- testWeblog = TestUtils.getManagedWebsite(testWeblog);
- MediaFileDirectory newDirectory3ById = mfMgr
- .getMediaFileDirectory(newDirectory3.getId());
- assertEquals(newDirectory3, newDirectory3ById);
-
- MediaFileDirectory newDirectory4 = mfMgr
- .createMediaFileDirectoryByPath(testWeblog,
- "/test1/test2/test3");
TestUtils.endSession(true);
-
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- MediaFileDirectory newDirectory4ById = mfMgr
- .getMediaFileDirectory(newDirectory4.getId());
- assertEquals(newDirectory4, newDirectory4ById);
-
- // show throw error when creating directory that already exists
- try {
- mfMgr.createMediaFileDirectoryByPath(testWeblog,
- "/test1/test2/test3");
- assertTrue(false);
- } catch (WebloggerException e) {
- assertTrue(true);
- }
TestUtils.endSession(true);
TestUtils.teardownWeblog(testWeblog.getId());
@@ -207,13 +179,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory directory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory directory = new MediaFileDirectory(null, "root",
- // "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(directory);
- // assertEquals("/", directory.getPath());
- // assertNotNull(directory.getId() != null);
+ .getDefaultMediaFileDirectory(testWeblog);
TestUtils.endSession(true);
@@ -223,7 +189,7 @@ public class MediaFileTest extends TestC
testWeblog = TestUtils.getManagedWebsite(testWeblog);
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
+ .getDefaultMediaFileDirectory(testWeblog);
assertEquals(directory, rootDirectory);
TestUtils.endSession(true);
@@ -247,21 +213,15 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
+ .getDefaultMediaFileDirectory(testWeblog);
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
-
- MediaFileDirectory directory2 = new MediaFileDirectory(rootDirectory,
- "dir2", "directory 2", testWeblog);
+ MediaFileDirectory directory2 = new MediaFileDirectory(testWeblog,
+ "dir2", "directory 2" );
mfMgr.createMediaFileDirectory(directory2);
- rootDirectory.getChildDirectories().add(directory2);
- MediaFileDirectory directory3 = new MediaFileDirectory(rootDirectory,
- "dir3", "directory 3", testWeblog);
+ MediaFileDirectory directory3 = new MediaFileDirectory(testWeblog,
+ "dir3", "directory 3");
mfMgr.createMediaFileDirectory(directory3);
- rootDirectory.getChildDirectories().add(directory3);
TestUtils.endSession(true);
@@ -270,9 +230,9 @@ public class MediaFileTest extends TestC
.getMediaFileDirectories(testWeblog);
assertNotNull(directories);
assertEquals(3, directories.size());
- assertTrue(containsPath(directories, "/"));
- assertTrue(containsPath(directories, "/dir2"));
- assertTrue(containsPath(directories, "/dir3"));
+ assertTrue(containsName(directories, "default"));
+ assertTrue(containsName(directories, "dir2"));
+ assertTrue(containsName(directories, "dir3"));
TestUtils.endSession(true);
TestUtils.teardownWeblog(testWeblog.getId());
@@ -285,10 +245,10 @@ public class MediaFileTest extends TestC
* a directory of given path.
*
*/
- private boolean containsPath(Collection<MediaFileDirectory> directories,
- String path) {
+ private boolean containsName(Collection<MediaFileDirectory> directories,
+ String name) {
for (MediaFileDirectory directory : directories) {
- if (path.equals(directory.getPath())) {
+ if (name.equals(directory.getName())) {
return true;
}
}
@@ -326,11 +286,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
TestUtils.endSession(true);
@@ -391,8 +347,8 @@ public class MediaFileTest extends TestC
*/
public void testCreateMediaFile() throws Exception {
- User testUser = null;
- Weblog testWeblog = null;
+ User testUser;
+ Weblog testWeblog;
testUser = TestUtils.setupUser("mediaFileTestUser3");
testWeblog = TestUtils.setupWeblog("mediaFileTestWeblog3", testUser);
@@ -401,11 +357,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
TestUtils.endSession(true);
@@ -459,7 +411,7 @@ public class MediaFileTest extends TestC
testWeblog = TestUtils.getManagedWebsite(testWeblog);
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
+ .getDefaultMediaFileDirectory(testWeblog);
try {
@@ -567,10 +519,10 @@ public class MediaFileTest extends TestC
filter2.setName("test_home.jpg");
searchResults = mfMgr.searchMediaFiles(testWeblog, filter2);
assertFalse(searchResults.isEmpty());
- assertEquals(id2, ((MediaFile) searchResults.get(0)).getId());
- assertNotNull(((MediaFile) searchResults.get(0)).getDirectory());
- assertEquals("/", ((MediaFile) searchResults.get(0)).getDirectory()
- .getPath());
+ assertEquals(id2, (searchResults.get(0)).getId());
+ assertNotNull((searchResults.get(0)).getDirectory());
+ assertEquals("default", (searchResults.get(0)).getDirectory()
+ .getName());
MediaFileFilter filter3 = new MediaFileFilter();
filter3.setName("test_work.jpg");
@@ -684,12 +636,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
- // TestUtils.endSession(true);
+ .getDefaultMediaFileDirectory(testWeblog);
for (int i = 0; i < 15; i++) {
rootDirectory = mfMgr.getMediaFileDirectory(rootDirectory
@@ -778,11 +725,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
TestUtils.endSession(true);
@@ -871,11 +814,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
TestUtils.endSession(true);
@@ -942,27 +881,20 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
- MediaFileDirectory directory1 = new MediaFileDirectory(rootDirectory,
- "dir1", "directory 1", testWeblog);
+ MediaFileDirectory directory1 = new MediaFileDirectory(testWeblog,
+ "dir1", "directory 1");
mfMgr.createMediaFileDirectory(directory1);
- rootDirectory.getChildDirectories().add(directory1);
- MediaFileDirectory directory2 = new MediaFileDirectory(rootDirectory,
- "dir2", "directory 2", testWeblog);
+ MediaFileDirectory directory2 = new MediaFileDirectory(testWeblog,
+ "dir2", "directory 2");
mfMgr.createMediaFileDirectory(directory2);
- rootDirectory.getChildDirectories().add(directory2);
- MediaFileDirectory directory3 = new MediaFileDirectory(rootDirectory,
- "dir3", "directory 3", testWeblog);
+ MediaFileDirectory directory3 = new MediaFileDirectory(testWeblog,
+ "dir3", "directory 3");
mfMgr.createMediaFileDirectory(directory3);
- rootDirectory.getChildDirectories().add(directory3);
-
+
TestUtils.endSession(true);
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -999,12 +931,12 @@ public class MediaFileTest extends TestC
testWeblog = TestUtils.getManagedWebsite(testWeblog);
rootDirectory = mfMgr.getMediaFileDirectory(rootDirectory.getId());
- Set<MediaFileDirectory> childDirectories = rootDirectory
- .getChildDirectories();
- assertEquals(3, childDirectories.size());
- assertTrue(containsPath(childDirectories, "/dir1"));
- assertTrue(containsPath(childDirectories, "/dir2"));
- assertTrue(containsPath(childDirectories, "/dir3"));
+ List<MediaFileDirectory> childDirectories = testWeblog
+ .getMediaFileDirectories();
+ assertEquals(4, childDirectories.size());
+ assertTrue(containsName(childDirectories, "dir1"));
+ assertTrue(containsName(childDirectories, "dir2"));
+ assertTrue(containsName(childDirectories, "dir3"));
Set<MediaFile> mediaFiles = rootDirectory.getMediaFiles();
assertEquals(2, mediaFiles.size());
@@ -1037,27 +969,21 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
+ .getDefaultMediaFileDirectory(testWeblog);
try {
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- //mfMgr.createMediaFileDirectory(rootDirectory);
-
MediaFileDirectory directory1 = new MediaFileDirectory(
- rootDirectory, "dir1", "directory 1", testWeblog);
+ testWeblog, "dir1", "directory 1");
mfMgr.createMediaFileDirectory(directory1);
- rootDirectory.getChildDirectories().add(directory1);
String dir1Id = directory1.getId();
MediaFileDirectory directory2 = new MediaFileDirectory(
- rootDirectory, "dir2", "directory 2", testWeblog);
+ testWeblog, "dir2", "directory 2");
mfMgr.createMediaFileDirectory(directory2);
- rootDirectory.getChildDirectories().add(directory2);
MediaFileDirectory directory3 = new MediaFileDirectory(
- rootDirectory, "dir3", "directory 3", testWeblog);
+ testWeblog, "dir3", "directory 3");
mfMgr.createMediaFileDirectory(directory3);
//rootDirectory.getChildDirectories().add(directory3);
@@ -1074,8 +1000,7 @@ public class MediaFileTest extends TestC
mediaFile.setCopyrightText("test 7.1 copyright text");
mediaFile.setSharedForGallery(false);
mediaFile.setLength(4000);
- mediaFile
- .setInputStream(getClass().getResourceAsStream(TEST_IMAGE));
+ mediaFile.setInputStream(getClass().getResourceAsStream(TEST_IMAGE));
mediaFile.setContentType("image/jpeg");
mfMgr.createMediaFile(testWeblog, mediaFile, new RollerMessages());
//rootDirectory.getMediaFiles().add(mediaFile);
@@ -1164,11 +1089,11 @@ public class MediaFileTest extends TestC
// now, let's check to see if migration was successful
MediaFileDirectory root1 = mgr
- .getMediaFileRootDirectory(testWeblog1);
+ .getDefaultMediaFileDirectory(testWeblog1);
assertNotNull("testblog1's mediafile dir exists", root1);
assertNotNull(mgr.getMediaFileByPath(testWeblog1, "/sub1/hawk.jpg"));
assertNotNull(mgr.getMediaFileByPath(testWeblog1,
- "/sub1/sub2/nasa.jpg"));
+ "/sub2/nasa.jpg"));
assertNotNull(mgr.getMediaFileByPath(testWeblog1,
"/roller50-prop.png"));
@@ -1176,7 +1101,7 @@ public class MediaFileTest extends TestC
"/sub1/hawk.jpg"));
MediaFileDirectory root2 = mgr
- .getMediaFileRootDirectory(testWeblog2);
+ .getDefaultMediaFileDirectory(testWeblog2);
assertNotNull("testblog2's mediafile dir exists", root2);
assertNotNull(root2.getMediaFile("amsterdam.jpg"));
assertNotNull(root2.getMediaFile("p47-thunderbolt.jpg"));
@@ -1220,42 +1145,33 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
+ .getDefaultMediaFileDirectory(testWeblog);
- MediaFileDirectory directory1 = new MediaFileDirectory(rootDirectory,
- "dir1", "directory 1", testWeblog);
+ MediaFileDirectory directory1 = new MediaFileDirectory(testWeblog,
+ "dir1", "directory 1");
mfMgr.createMediaFileDirectory(directory1);
- rootDirectory.getChildDirectories().add(directory1);
- MediaFileDirectory directory2 = new MediaFileDirectory(rootDirectory,
- "dir2", "directory 2", testWeblog);
+ MediaFileDirectory directory2 = new MediaFileDirectory(testWeblog,
+ "dir2", "directory 2");
mfMgr.createMediaFileDirectory(directory2);
- rootDirectory.getChildDirectories().add(directory2);
- MediaFileDirectory directory3 = new MediaFileDirectory(rootDirectory,
- "dir3", "directory 3", testWeblog);
+ MediaFileDirectory directory3 = new MediaFileDirectory(testWeblog,
+ "dir3", "directory 3");
mfMgr.createMediaFileDirectory(directory3);
- rootDirectory.getChildDirectories().add(directory3);
TestUtils.endSession(true);
testWeblog = TestUtils.getManagedWebsite(testWeblog);
rootDirectory = mfMgr.getMediaFileDirectory(rootDirectory.getId());
- Set<MediaFileDirectory> childDirectories = rootDirectory
- .getChildDirectories();
+ List<MediaFileDirectory> childDirectories = testWeblog.getMediaFileDirectories();
+
assertEquals(3, childDirectories.size());
TestUtils.endSession(true);
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- // Using named query MediaFileDirectory.getByWeblogAndNoParent
- MediaFileDirectory directory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- assertEquals(3, directory.getChildDirectories().size());
-
// Delete folder
MediaFileDirectory directoryById = mfMgr
.getMediaFileDirectory(directory1.getId());
@@ -1263,14 +1179,6 @@ public class MediaFileTest extends TestC
mfMgr.removeMediaFileDirectory(directoryById);
TestUtils.endSession(true);
- directory = null;
-
- // Using named query again MediaFileDirectory.getByWeblogAndNoParent
- directory = mfMgr.getMediaFileRootDirectory(testWeblog);
-
- // There should only be two, the database only has two.
- assertEquals(2, directory.getChildDirectories().size());
-
TestUtils.endSession(true);
TestUtils.teardownWeblog(testWeblog.getId());
TestUtils.teardownUser(testUser.getUserName());
Modified: roller/branches/rome2/app/src/test/resources/roller-custom.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/resources/roller-custom.properties?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/test/resources/roller-custom.properties (original)
+++ roller/branches/rome2/app/src/test/resources/roller-custom.properties Sun Jun 8 20:23:32 2014
@@ -36,7 +36,7 @@ cache.dir=${project.build.directory}/pla
uploads.migrate.auto=false
# override tasks.enabled so we can add a test task
-tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,TurnoverReferersTask,PingQueueTask,TestTask
+tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,PingQueueTask,TestTask
# test task
tasks.TestTask.class=org.apache.roller.weblogger.business.TestTask
Modified: roller/branches/rome2/app/src/test/resources/roller-jettyrun.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/resources/roller-jettyrun.properties?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/app/src/test/resources/roller-jettyrun.properties (original)
+++ roller/branches/rome2/app/src/test/resources/roller-jettyrun.properties Sun Jun 8 20:23:32 2014
@@ -37,7 +37,7 @@ log4j.appender.roller.File=${project.bui
uploads.migrate.auto=false
# override tasks.enabled so we can add a test task
-tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,TurnoverReferersTask,PingQueueTask,TestTask
+tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,PingQueueTask,TestTask
# test task
tasks.TestTask.class=org.apache.roller.weblogger.business.TestTask
Modified: roller/branches/rome2/docs/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/roller-install-guide.odt?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/branches/rome2/docs/roller-template-guide.odt
URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/roller-template-guide.odt?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/branches/rome2/docs/roller-user-guide.odt
URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/roller-user-guide.odt?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/branches/rome2/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/pom.xml?rev=1601254&r1=1601253&r2=1601254&view=diff
==============================================================================
--- roller/branches/rome2/pom.xml (original)
+++ roller/branches/rome2/pom.xml Sun Jun 8 20:23:32 2014
@@ -29,7 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <derby.version>10.10.1.1</derby.version>
+ <derby.version>10.10.2.0</derby.version>
</properties>
<modules>
Re: svn commit: r1601254 [4/4] - in /roller/branches/rome2: ./ app/
app/src/main/java/org/apache/roller/util/ app/src/main/java/org/apache/roller/weblogger/business/
app/src/main/java/org/apache/roller/weblogger/business/jpa/ app/src/main/java/org/apache/r...
Posted by Glen Mazza <gl...@gmail.com>.
Not a problem, if you end up needing more time (say, next weekend), just
let us know.
Glen
On 6/8/2014 6:27 PM, Dave wrote:
> That would be very nice. I hope to complete the merge tonight or tomorrow.
>
> - Dave
>
>
>
> On Sunday, June 8, 2014, Glen Mazza <gl...@gmail.com> wrote:
>
>> Dave, would you like us to hold off on commits to trunk for a few days
>> until you're able to merge this back to trunk (no problem for me), or it
>> doesn't matter to you?
>>
>> Regards,
>> Glen
>>
>> On 6/8/2014 4:23 PM, snoopdave@apache.org wrote:
>>
>> Modified: roller/branches/rome2/app/src/main/resources/sql/createdb.vm
>> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/
>> main/resources/sql/createdb.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
>> ============================================================
>> ==================
>> --- roller/branches/rome2/app/src/main/resources/sql/createdb.vm
>> (original)
>> +++ roller/branches/rome2/app/src/main/resources/sql/createdb.vm Sun Jun
>> 8 20:23:32 2014
>> @@ -133,7 +133,8 @@ create table website (
>> showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null,
>> customstylesheet varchar(128),
>> about varchar(255),
>> - icon varchar(255)
>> + icon varchar(255),
>> + analyticscode $db.TEXT_SQL_TYPE
>> );
>> create index ws_isenabled_idx on website(isenabled);
>> alter table website add constraint ws_handle_uq unique
>> (handle$!db.INDEXSIZE);
>> @@ -142,7 +143,7 @@ alter table website add constraint ws_ha
>> -- create index ws_handle_idx on website(handle);
>> -create table rol_weblogtheme (
>> +create table roller_weblogtheme (
>> id varchar(48) not null primary key,
>> weblogid varchar(48) not null,
>> name varchar(255) not null,
>> @@ -150,7 +151,7 @@ create table rol_weblogtheme (
>> #columnNotNullWithDefault('type' 'varchar(16)' 'standard')
>> );
>> -create table rol_templatecode (
>> +create table roller_templatecode (
>> id varchar(48) not null primary key,
>> templateid varchar(48) not null,
>> template $db.TEXT_SQL_TYPE not null,
>> @@ -316,32 +317,6 @@ create index pqe_entrytime_idx on pingqu
>> create index pqe_pingtid_idx on pingqueueentry( pingtargetid );
>> create index pqe_websiteid_idx on pingqueueentry( websiteid );
>> -
>> --- Referer tracks URLs that refer to websites and entries
>> -create table referer (
>> - id varchar(48) not null primary key,
>> - websiteid varchar(48) not null,
>> - entryid varchar(48),
>> - datestr varchar(10),
>> - refurl varchar(255) not null,
>> - refpermalink varchar(255),
>> - reftime $db.TIMESTAMP_SQL_TYPE,
>> - requrl varchar(255),
>> - title varchar(255),
>> - excerpt $db.TEXT_SQL_TYPE,
>> - dayhits integer default 0 not null,
>> - totalhits integer default 0 not null,
>> - visible $db.BOOLEAN_SQL_TYPE_FALSE not null,
>> - duplicate $db.BOOLEAN_SQL_TYPE_FALSE not null
>> -);
>> -create index ref_websiteid_idx on referer( websiteid );
>> -create index ref_entryid_idx on referer( entryid );
>> -create index ref_refurl_idx on referer( refurl$!db.INDEXSIZE );
>> -create index ref_requrl_idx on referer( requrl$!db.INDEXSIZE );
>> -create index ref_datestr_idx on referer( datestr );
>> -create index ref_refpermlnk_idx on referer( refpermalink$!db.INDEXSIZE );
>> -create index ref_duplicate_idx on referer( duplicate );
>> -
>> create table roller_properties (
>> name varchar(255) not null primary key,
>> value $db.TEXT_SQL_TYPE
>> @@ -504,9 +479,7 @@ create table roller_mediafiledir (
>> id varchar(48) not null primary key,
>> name varchar(255) not null,
>> description varchar(255),
>> - websiteid varchar(48) not null,
>> - parentid varchar(48),
>> - path varchar(255)
>> + websiteid varchar(48) not null
>> );
>> @@ -535,14 +508,6 @@ alter table roller_comment add constrain
>> alter table entryattribute add constraint att_entryid_fk
>> foreign key ( entryid ) references weblogentry( id )
>> $!db.ADDL_FK_PARAMS ;
>> --- referer
>> -
>> -alter table referer add constraint ref_entryid_fk
>> - foreign key ( entryid ) references weblogentry( id )
>> $!db.ADDL_FK_PARAMS ;
>> -
>> -alter table referer add constraint ref_websiteid_fk
>> - foreign key ( websiteid ) references website( id )
>> $!db.ADDL_FK_PARAMS ;
>> -
>> -- folder and bookmark
>> alter table folder add constraint fo_websiteid_fk
>> @@ -562,9 +527,6 @@ alter table roller_mediafiletag add cons
>> alter table roller_mediafiledir add constraint mf_websiteid_fk
>> foreign key ( websiteid ) references website( id )
>> $!db.ADDL_FK_PARAMS ;
>> -alter table roller_mediafiledir add constraint mf_parentid_fk
>> - foreign key ( parentid ) references roller_mediafiledir( id )
>> $!db.ADDL_FK_PARAMS ;
>> -
>> -- newsfeed
>> alter table newsfeed add constr
>>
>>
Re: svn commit: r1601254 [4/4] - in /roller/branches/rome2: ./ app/
app/src/main/java/org/apache/roller/util/ app/src/main/java/org/apache/roller/weblogger/business/
app/src/main/java/org/apache/roller/weblogger/business/jpa/ app/src/main/java/org/apache/r...
Posted by Dave <sn...@gmail.com>.
That would be very nice. I hope to complete the merge tonight or tomorrow.
- Dave
On Sunday, June 8, 2014, Glen Mazza <gl...@gmail.com> wrote:
> Dave, would you like us to hold off on commits to trunk for a few days
> until you're able to merge this back to trunk (no problem for me), or it
> doesn't matter to you?
>
> Regards,
> Glen
>
> On 6/8/2014 4:23 PM, snoopdave@apache.org wrote:
>
> Modified: roller/branches/rome2/app/src/main/resources/sql/createdb.vm
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/
> main/resources/sql/createdb.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
> ============================================================
> ==================
> --- roller/branches/rome2/app/src/main/resources/sql/createdb.vm
> (original)
> +++ roller/branches/rome2/app/src/main/resources/sql/createdb.vm Sun Jun
> 8 20:23:32 2014
> @@ -133,7 +133,8 @@ create table website (
> showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null,
> customstylesheet varchar(128),
> about varchar(255),
> - icon varchar(255)
> + icon varchar(255),
> + analyticscode $db.TEXT_SQL_TYPE
> );
> create index ws_isenabled_idx on website(isenabled);
> alter table website add constraint ws_handle_uq unique
> (handle$!db.INDEXSIZE);
> @@ -142,7 +143,7 @@ alter table website add constraint ws_ha
> -- create index ws_handle_idx on website(handle);
> -create table rol_weblogtheme (
> +create table roller_weblogtheme (
> id varchar(48) not null primary key,
> weblogid varchar(48) not null,
> name varchar(255) not null,
> @@ -150,7 +151,7 @@ create table rol_weblogtheme (
> #columnNotNullWithDefault('type' 'varchar(16)' 'standard')
> );
> -create table rol_templatecode (
> +create table roller_templatecode (
> id varchar(48) not null primary key,
> templateid varchar(48) not null,
> template $db.TEXT_SQL_TYPE not null,
> @@ -316,32 +317,6 @@ create index pqe_entrytime_idx on pingqu
> create index pqe_pingtid_idx on pingqueueentry( pingtargetid );
> create index pqe_websiteid_idx on pingqueueentry( websiteid );
> -
> --- Referer tracks URLs that refer to websites and entries
> -create table referer (
> - id varchar(48) not null primary key,
> - websiteid varchar(48) not null,
> - entryid varchar(48),
> - datestr varchar(10),
> - refurl varchar(255) not null,
> - refpermalink varchar(255),
> - reftime $db.TIMESTAMP_SQL_TYPE,
> - requrl varchar(255),
> - title varchar(255),
> - excerpt $db.TEXT_SQL_TYPE,
> - dayhits integer default 0 not null,
> - totalhits integer default 0 not null,
> - visible $db.BOOLEAN_SQL_TYPE_FALSE not null,
> - duplicate $db.BOOLEAN_SQL_TYPE_FALSE not null
> -);
> -create index ref_websiteid_idx on referer( websiteid );
> -create index ref_entryid_idx on referer( entryid );
> -create index ref_refurl_idx on referer( refurl$!db.INDEXSIZE );
> -create index ref_requrl_idx on referer( requrl$!db.INDEXSIZE );
> -create index ref_datestr_idx on referer( datestr );
> -create index ref_refpermlnk_idx on referer( refpermalink$!db.INDEXSIZE );
> -create index ref_duplicate_idx on referer( duplicate );
> -
> create table roller_properties (
> name varchar(255) not null primary key,
> value $db.TEXT_SQL_TYPE
> @@ -504,9 +479,7 @@ create table roller_mediafiledir (
> id varchar(48) not null primary key,
> name varchar(255) not null,
> description varchar(255),
> - websiteid varchar(48) not null,
> - parentid varchar(48),
> - path varchar(255)
> + websiteid varchar(48) not null
> );
> @@ -535,14 +508,6 @@ alter table roller_comment add constrain
> alter table entryattribute add constraint att_entryid_fk
> foreign key ( entryid ) references weblogentry( id )
> $!db.ADDL_FK_PARAMS ;
> --- referer
> -
> -alter table referer add constraint ref_entryid_fk
> - foreign key ( entryid ) references weblogentry( id )
> $!db.ADDL_FK_PARAMS ;
> -
> -alter table referer add constraint ref_websiteid_fk
> - foreign key ( websiteid ) references website( id )
> $!db.ADDL_FK_PARAMS ;
> -
> -- folder and bookmark
> alter table folder add constraint fo_websiteid_fk
> @@ -562,9 +527,6 @@ alter table roller_mediafiletag add cons
> alter table roller_mediafiledir add constraint mf_websiteid_fk
> foreign key ( websiteid ) references website( id )
> $!db.ADDL_FK_PARAMS ;
> -alter table roller_mediafiledir add constraint mf_parentid_fk
> - foreign key ( parentid ) references roller_mediafiledir( id )
> $!db.ADDL_FK_PARAMS ;
> -
> -- newsfeed
> alter table newsfeed add constr
>
>
Re: svn commit: r1601254 [4/4] - in /roller/branches/rome2: ./ app/
app/src/main/java/org/apache/roller/util/ app/src/main/java/org/apache/roller/weblogger/business/
app/src/main/java/org/apache/roller/weblogger/business/jpa/ app/src/main/java/org/apache/r...
Posted by Glen Mazza <gl...@gmail.com>.
Dave, would you like us to hold off on commits to trunk for a few days
until you're able to merge this back to trunk (no problem for me), or it
doesn't matter to you?
Regards,
Glen
On 6/8/2014 4:23 PM, snoopdave@apache.org wrote:
> Modified: roller/branches/rome2/app/src/main/resources/sql/createdb.vm
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/createdb.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/resources/sql/createdb.vm (original)
> +++ roller/branches/rome2/app/src/main/resources/sql/createdb.vm Sun Jun 8 20:23:32 2014
> @@ -133,7 +133,8 @@ create table website (
> showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null,
> customstylesheet varchar(128),
> about varchar(255),
> - icon varchar(255)
> + icon varchar(255),
> + analyticscode $db.TEXT_SQL_TYPE
> );
> create index ws_isenabled_idx on website(isenabled);
> alter table website add constraint ws_handle_uq unique (handle$!db.INDEXSIZE);
> @@ -142,7 +143,7 @@ alter table website add constraint ws_ha
> -- create index ws_handle_idx on website(handle);
>
>
> -create table rol_weblogtheme (
> +create table roller_weblogtheme (
> id varchar(48) not null primary key,
> weblogid varchar(48) not null,
> name varchar(255) not null,
> @@ -150,7 +151,7 @@ create table rol_weblogtheme (
> #columnNotNullWithDefault('type' 'varchar(16)' 'standard')
> );
>
> -create table rol_templatecode (
> +create table roller_templatecode (
> id varchar(48) not null primary key,
> templateid varchar(48) not null,
> template $db.TEXT_SQL_TYPE not null,
> @@ -316,32 +317,6 @@ create index pqe_entrytime_idx on pingqu
> create index pqe_pingtid_idx on pingqueueentry( pingtargetid );
> create index pqe_websiteid_idx on pingqueueentry( websiteid );
>
> -
> --- Referer tracks URLs that refer to websites and entries
> -create table referer (
> - id varchar(48) not null primary key,
> - websiteid varchar(48) not null,
> - entryid varchar(48),
> - datestr varchar(10),
> - refurl varchar(255) not null,
> - refpermalink varchar(255),
> - reftime $db.TIMESTAMP_SQL_TYPE,
> - requrl varchar(255),
> - title varchar(255),
> - excerpt $db.TEXT_SQL_TYPE,
> - dayhits integer default 0 not null,
> - totalhits integer default 0 not null,
> - visible $db.BOOLEAN_SQL_TYPE_FALSE not null,
> - duplicate $db.BOOLEAN_SQL_TYPE_FALSE not null
> -);
> -create index ref_websiteid_idx on referer( websiteid );
> -create index ref_entryid_idx on referer( entryid );
> -create index ref_refurl_idx on referer( refurl$!db.INDEXSIZE );
> -create index ref_requrl_idx on referer( requrl$!db.INDEXSIZE );
> -create index ref_datestr_idx on referer( datestr );
> -create index ref_refpermlnk_idx on referer( refpermalink$!db.INDEXSIZE );
> -create index ref_duplicate_idx on referer( duplicate );
> -
> create table roller_properties (
> name varchar(255) not null primary key,
> value $db.TEXT_SQL_TYPE
> @@ -504,9 +479,7 @@ create table roller_mediafiledir (
> id varchar(48) not null primary key,
> name varchar(255) not null,
> description varchar(255),
> - websiteid varchar(48) not null,
> - parentid varchar(48),
> - path varchar(255)
> + websiteid varchar(48) not null
> );
>
>
> @@ -535,14 +508,6 @@ alter table roller_comment add constrain
> alter table entryattribute add constraint att_entryid_fk
> foreign key ( entryid ) references weblogentry( id ) $!db.ADDL_FK_PARAMS ;
>
> --- referer
> -
> -alter table referer add constraint ref_entryid_fk
> - foreign key ( entryid ) references weblogentry( id ) $!db.ADDL_FK_PARAMS ;
> -
> -alter table referer add constraint ref_websiteid_fk
> - foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
> -
> -- folder and bookmark
>
> alter table folder add constraint fo_websiteid_fk
> @@ -562,9 +527,6 @@ alter table roller_mediafiletag add cons
> alter table roller_mediafiledir add constraint mf_websiteid_fk
> foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
>
> -alter table roller_mediafiledir add constraint mf_parentid_fk
> - foreign key ( parentid ) references roller_mediafiledir( id ) $!db.ADDL_FK_PARAMS ;
> -
> -- newsfeed
>
> alter table newsfeed add constraint nf_websiteid_fk
>
> Modified: roller/branches/rome2/app/src/main/resources/sql/droptables.sql
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/droptables.sql?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/resources/sql/droptables.sql (original)
> +++ roller/branches/rome2/app/src/main/resources/sql/droptables.sql Sun Jun 8 20:23:32 2014
> @@ -33,7 +33,6 @@ drop table roller_tasklock;
> drop table pingqueueentry;
> drop table autoping;
> drop table pingtarget;
> -drop table referer;
> drop table bookmark;
> drop table folder;
> drop table roller_userattribute;
> @@ -51,8 +50,8 @@ drop table entryattribute;
> drop table weblogentry;
> drop table weblogcategory;
> drop table webpage;
> -drop table rol_weblogtheme;
> -drop table rol_templatecode;
> +drop table roller_weblogtheme;
> +drop table roller_templatecode;
>
> -- core platform tables
> drop table roller_permission;
>
> Modified: roller/branches/rome2/app/src/main/resources/sql/macros.vm
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/macros.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/resources/sql/macros.vm (original)
> +++ roller/branches/rome2/app/src/main/resources/sql/macros.vm Sun Jun 8 20:23:32 2014
> @@ -89,7 +89,7 @@ Macro to account for lack of comparable
> #macro(longtext $size) #if($db.DBTYPE == "MYSQL") text #else varchar($size) #end #end
>
>
> -#macro(dropIndex $indexName $tableName)
> +#macro(dropIndex $tableName $indexName)
> #if ($db.DBTYPE == "DERBY" || $db.DBTYPE == 'POSTGRESQL')
> drop index $indexName;
> #elseif ($db.DBTYPE == "MYSQL")
>
> Modified: roller/branches/rome2/app/src/main/resources/struts.xml
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/struts.xml?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/resources/struts.xml (original)
> +++ roller/branches/rome2/app/src/main/resources/struts.xml Sun Jun 8 20:23:32 2014
> @@ -1,6 +1,6 @@
> <!DOCTYPE struts PUBLIC
> - "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
> - "http://struts.apache.org/dtds/struts-2.0.dtd">
> + "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
> + "http://struts.apache.org/dtds/struts-2.3.dtd">
> <struts>
>
> <!-- Weblogger default package -->
> @@ -42,15 +42,19 @@
> <!-- <interceptor-ref name="staticParams"/> -->
> <interceptor-ref name="actionMappingParams"/>
> <interceptor-ref name="params">
> - <param name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
> + <param name="excludeParams">(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
> </interceptor-ref>
> <interceptor-ref name="conversionError"/>
>
> <!-- custom Roller interceptors -->
> - <interceptor-ref name="UIActionInterceptor"/>
> - <interceptor-ref name="UISecurityInterceptor"/>
> + <interceptor-ref name="UIActionInterceptor">
> + <param name="excludeMethods">cancel</param>
> + </interceptor-ref>
> + <interceptor-ref name="UISecurityInterceptor">
> + <param name="excludeMethods">cancel</param>
> + </interceptor-ref>
> <interceptor-ref name="UIActionPrepareInterceptor">
> - <param name="excludeMethods">input,back,cancel,browse</param>
> + <param name="excludeMethods">cancel</param>
> </interceptor-ref>
>
> <!-- validation interceptors, MUST come after our custom interceptors -->
> @@ -437,13 +441,7 @@
> <result name="input" type="tiles">.WeblogExport</result>
> <!--<result name="success" type="chain">weblogExport</result>-->
> </action>
> -
> - <action name="referrers!*" method="{1}"
> - class="org.apache.roller.weblogger.ui.struts2.editor.Referrers">
> - <result name="list" type="tiles">.Referrers</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/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp (original)
> +++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Sun Jun 8 20:23:32 2014
> @@ -77,7 +77,6 @@ function onMove()
> <s:hidden name="folderId" />
>
> <s:if test="!allFolders.isEmpty">
> -
> <%-- View button --%>
> <s:submit type="button" action="bookmarks!view" key="bookmarksForm.viewFolder" />
>
> @@ -85,7 +84,6 @@ function onMove()
> <s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name" />
>
> <br /><br />
> -
> </s:if>
> <table class="rollertable">
>
>
> Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp (original)
> +++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp Sun Jun 8 20:23:32 2014
> @@ -70,7 +70,7 @@
> <s:form id="entry" action="mediaFileAdd!save" method="POST" enctype="multipart/form-data">
> <s:hidden name="salt" />
> <s:hidden name="weblog" />
> - <s:hidden name="directoryPath" />
> + <s:hidden name="directoryName" />
>
> <%-- ================================================================== --%>
> <%-- Title, category, dates and other metadata --%>
> @@ -118,7 +118,7 @@
> <label for="status"><s:text name="mediaFileAdd.directory" /></label>
> </td>
> <td>
> - <s:select name="bean.directoryId" list="allDirectories" listKey="id" listValue="path" />
> + <s:select name="bean.directoryId" list="allDirectories" listKey="id" listValue="name" />
> </td>
> </tr>
>
>
> Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp (original)
> +++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp Sun Jun 8 20:23:32 2014
> @@ -161,7 +161,7 @@
> <li>
> <s:url id="mediaFileAddURL" action="mediaFileAdd">
> <s:param name="weblog" value="%{actionWeblog.handle}" />
> - <s:param name="directoryPath" value="%{directoryPath}" />
> + <s:param name="directoryName" value="%{directoryName}" />
> </s:url>
> <s:a href="%{mediaFileAddURL}">
> <s:text name="mediaFileSuccess.addAnother" />
>
> Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp (original)
> +++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp Sun Jun 8 20:23:32 2014
> @@ -166,7 +166,7 @@ $("#d_clip_button").ready(function() {
> </td>
> <td>
> <s:select name="bean.directoryId" list="allDirectories"
> - listKey="id" listValue="path" tabindex="5" />
> + listKey="id" listValue="name" tabindex="5" />
> </td>
> </tr>
>
> @@ -192,7 +192,7 @@ $("#d_clip_button").ready(function() {
> </td>
> </tr>
>
> - <!-- orginal path from base URL of ctx/resources/ -->
> + <!-- original path from base URL of ctx/resources/ -->
> <% if (WebloggerConfig.getBooleanProperty("mediafile.originalPathEdit.enabled")) { %>
> <tr>
> <td class="originalPathLabel">
>
> Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp (original)
> +++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp Sun Jun 8 20:23:32 2014
> @@ -61,7 +61,7 @@
>
> <%-- Subtitle and folder path --%>
>
> -<s:if test='currentDirectory.path.equals("/")'>
> +<s:if test='currentDirectory.name.equals("default")'>
>
> <p class="subtitle">
> <s:text name="mediaFileImageChooser.subtitle" >
> @@ -78,10 +78,10 @@
> <s:else>
>
> <p class="subtitle">
> - <s:text name="mediaFileView.path"/> /
> + <s:text name="mediaFileView.folderName"/> /
> <s:iterator id="directory" value="currentDirectoryHierarchy">
> <s:url id="getDirectoryByPathUrl" action="mediaFileImageChooser">
> - <s:param name="directoryPath" value="#directory.key" />
> + <s:param name="directoryName" value="#directory.key" />
> <s:param name="weblog" value="%{actionWeblog.handle}" />
> </s:url>
> <s:a href="%{getDirectoryByPathUrl}"><s:property value="#directory.value" /></s:a> /
>
> Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp (original)
> +++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp Sun Jun 8 20:23:32 2014
> @@ -30,7 +30,7 @@
> <img src='<s:url value="/images/image_add.png"/>' border="0"alt="icon" />
> <s:url id="mediaFileAddURL" action="mediaFileAdd">
> <s:param name="weblog" value="%{actionWeblog.handle}" />
> - <s:param name="directoryPath" value="%{directoryPath}" />
> + <s:param name="directoryName" value="%{directoryName}" />
> </s:url>
> <a href='<s:property escape="false" value="%{mediaFileAddURL}" />'
> <s:if test="actionName.equals('mediaFileAdd')">style='font-weight:bold;'</s:if> >
>
> Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp (original)
> +++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp Sun Jun 8 20:23:32 2014
> @@ -68,11 +68,28 @@
>
>
> <script type="text/javascript">
> + toggleState = 'Off'
>
> function onSelectDirectory(id) {
> window.location = "<s:url action="mediaFileView" />?directoryId=" + id + "&weblog=" + '<s:property value="actionWeblog.handle" />';
> }
>
> + function onToggle() {
> + if (toggleState == 'Off') {
> + toggleState = 'On';
> + toggleFunction(true, 'selectedMediaFiles');
> + $("#deleteButton").attr('disabled',false)
> + $("#moveButton").attr('disabled',false)
> + $("#moveTargetMenu").attr('disabled',false)
> + } else {
> + toggleState = 'Off';
> + toggleFunction(false, 'selectedMediaFiles');
> + $("#deleteButton").attr('disabled',true)
> + $("#moveButton").attr('disabled',true)
> + $("#moveTargetMenu").attr('disabled',true)
> + }
> + }
> +
> function onDeleteSelected() {
> if ( confirm("<s:text name='mediaFile.delete.confirm' />") ) {
> document.mediaFileViewForm.action='<s:url action="mediaFileView!deleteSelected" />';
> @@ -80,6 +97,13 @@
> }
> }
>
> + function onDeleteFolder() {
> + if (confirm("<s:text name='mediaFile.deleteFolder.confirm' />")) {
> + document.bookmarks.action='<s:url action="mediaFileView!deleteFolder" />';
> + document.bookmarks.submit();
> + }
> + }
> +
> function onMoveSelected() {
> if ( confirm("<s:text name='mediaFile.move.confirm' />") ) {
> document.mediaFileViewForm.action='<s:url action="mediaFileView!moveSelected" />';
> @@ -193,7 +217,7 @@
>
> <%-- Subtitle and folder path --%>
>
> -<s:if test='currentDirectory.path.equals("/")'>
> +<s:if test='currentDirectory.name.equals("default")'>
>
> <p class="subtitle">
> <s:text name="mediaFileView.subtitle" >
> @@ -267,16 +291,7 @@
> <s:else>
>
> <p class="subtitle">
> - <s:text name="mediaFileView.path"/> /
> - <s:iterator id="directory" value="currentDirectoryHierarchy">
> -
> - <s:url id="getDirectoryByPathUrl" action="mediaFileView">
> - <s:param name="directoryPath" value="#directory.key" />
> - <s:param name="weblog" value="%{actionWeblog.handle}" />
> - </s:url>
> - <s:a href="%{getDirectoryByPathUrl}"><s:property value="#directory.value" /></s:a> /
> -
> - </s:iterator>
> + <s:text name="mediaFileView.name"/>: <s:text name="currentDirectory.name" />
> </p>
> <p class="pagetip">
> <s:text name="mediaFileView.dirPageTip" />
> @@ -285,7 +300,7 @@
> </s:else>
>
>
> -<s:if test="childFiles || childDirectories || (pager && pager.items.size() > 0)">
> +<s:if test="childFiles || (pager && pager.items.size() > 0)">
>
> <s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView">
> <s:hidden name="salt" />
> @@ -295,8 +310,7 @@
> <input type="hidden" name="mediaFileId" value="" />
>
> <div class="control">
> -
> - <span style="padding-left:20px">
> + <span style="padding-left:7px">
> <s:text name="mediaFileView.sortby" />
> <s:select id="sortByMenu" name="sortBy" list="sortOptions" listKey="key"
> listValue="value"
> @@ -304,18 +318,17 @@
> </span>
>
> <span style="float:right">
> - <input id="deleteButton" type="button" style="padding-right:20px"
> - value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()" />
> + <s:if test="!allDirectories.isEmpty">
> + <%-- View button --%>
> + <s:submit type="button" action="mediaFileView!view" key="mediaFileView.viewFolder" />
>
> - <input id="moveButton" type="button" style="padding-left:20px"
> - value=<s:text name="mediaFileView.moveSelected" /> onclick="onMoveSelected()" />
> + <%-- Folder to View combo-box --%>
> + <s:select name="viewDirectoryId" list="allDirectories" listKey="id" listValue="name" />
>
> - <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" listValue="path" />
> + </s:if>
> </span>
> -
> </div>
>
> -
> <%-- ***************************************************************** --%>
>
> <%-- Media file folder contents --%>
> @@ -339,32 +352,11 @@
>
> <%-- NOT SEARCH RESULTS --%>
>
> - <s:if test="childDirectories.size() == 0 && childFiles.size() ==0">
> + <s:if test="childFiles.size() ==0">
> <p style="text-align: center"><s:text name="mediaFileView.noFiles"/></p>
> </s:if>
>
> - <%-- List media directories first --%>
> -
> - <s:iterator id="directory" value="childDirectories">
> - <li class="align-images"
> - onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
> - <div class="mediaObject">
> - <img border="0" src='<s:url value="/images/folder.png"/>'
> - class="dir-image" alt="mediaFolder.png"
> - onclick="onSelectDirectory('<s:property value="#directory.id"/>')"/>
> - </div>
> - <div class="mediaObjectInfo">
> - <input type="checkbox"
> - name="selectedMediaFileDirectories"
> - value="<s:property value="#directory.id"/>"/>
> - <inut type="hidden" id="mediadiridentity"
> - value="<s:property value='#directory.id'/>">
> - <s:property value="#directory.name" />
> - </div>
> - </li>
> - </s:iterator>
> -
> - <%-- List media files next --%>
> + <%-- List media files --%>
>
> <s:iterator id="mediaFile" value="childFiles">
>
> @@ -475,6 +467,32 @@
>
> <div style="clear:left;"></div>
>
> + <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0) || (currentDirectory.name != 'default' && !pager)">
> + <div class="control">
> +
> + <span style="padding-left:7px">
> + <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0)">
> + <input id="toggleButton" type="button"
> + value='<s:text name="mediaFileView.toggleSelected" />' onclick="onToggle()" />
> +
> + <input id="deleteButton" type="button"
> + value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()" />
> +
> + <input id="moveButton" type="button"
> + value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()" />
> +
> + <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" listValue="name" />
> + </s:if>
> + </span>
> +
> + <s:if test="currentDirectory.name != 'default' && !pager">
> + <span style="float:right">
> + <s:submit value="%{getText('mediaFileView.deleteFolder')}" action="mediaFileView!deleteFolder" onclick="onDeleteFolder();return false;"/>
> + </span>
> + </s:if>
> + </div>
> + </s:if>
> +
> </s:form>
>
> </s:if>
>
> Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp (original)
> +++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp Sun Jun 8 20:23:32 2014
> @@ -235,6 +235,20 @@
> <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td>
> </tr>
>
> +
> + <%-- ***** Web analytics settings ***** --%>
> +
> + <s:if test="getBooleanProp('analytics.code.override.allowed')">
> + <tr>
> + <td colspan="3"><h2><s:text name="configForm.webAnalytics" /></h2></td>
> + </tr>
> +
> + <tr>
> + <td class="label"><s:text name="websiteSettings.analyticsTrackingCode" /></td>
> + <td class="field"><s:textarea name="bean.analyticsCode" rows="10" cols="70"/></td>
> + </tr>
> + </s:if>
> +
> <%-- ***** Global admin only settings ***** --%>
> <s:if test="authenticatedUser.hasGlobalPermission('admin')">
> <tr>
>
> Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/tiles.xml
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/tiles.xml?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/WEB-INF/tiles.xml (original)
> +++ roller/branches/rome2/app/src/main/webapp/WEB-INF/tiles.xml Sun Jun 8 20:23:32 2014
> @@ -386,10 +386,6 @@
> <put-attribute name="content" value="/WEB-INF/jsps/editor/Resources.jsp" />
> </definition>
>
> - <definition name=".Referrers" extends=".tiles-tabbedpage" >
> - <put-attribute name="content" value="/WEB-INF/jsps/editor/Referrers.jsp" />
> - </definition>
> -
> <definition name=".WeblogExport" extends=".tiles-tabbedpage" >
> <put-attribute name="content" value="/WEB-INF/jsps/editor/WeblogExport.jsp" />
> </definition>
>
> Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
> +++ roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm Sun Jun 8 20:23:32 2014
> @@ -24,6 +24,7 @@ These are the documented macros in order
> #showAutodiscoveryLinks($weblog)
> #showTrackbackAutodiscovery($entry)
> #showMetaDescription()
> + #showAnalyticsTrackingCode($weblog)
>
> #showWeblogEntriesPager($pager)
> #showNextPrevEntriesControl($pager)
> @@ -37,7 +38,6 @@ These are the documented macros in order
> #showBookmarkLinksList($folderObj)
> #showWeblogCategoryLinksList()
> #showMobileCategoryLinksList()
> - #showReferrersList($weblog)
> #showAtomFeedsList($weblog)
> #showRSSFeedsList($weblog)
>
> @@ -155,6 +155,19 @@ will be created.
> #end
> #end
>
> +#**
> +Adds a tracking code for website analytics (e.g. Google Analytics). Will use the blog-defined
> +tracking code if defined and permitted by the installation, else the server-defined tracking
> +code if defined will be used.
> +*#
> +#macro(showAnalyticsTrackingCode $weblog)
> + #if ($config.analyticsOverrideAllowed && $utils.isNotEmpty($weblog.analyticsCode))
> + $weblog.analyticsCode
> + #elseif ($utils.isNotEmpty($config.defaultAnalyticsTrackingCode))
> + $config.defaultAnalyticsTrackingCode
> + #end
> +#end
> +
> #**
> Shows weblog entries pager via default day template
> *#
> @@ -566,49 +579,6 @@ Show weblog's categories in specified pa
> <a href="#categories" data-rel="popup" data-role="button">Categories - $active</a>
> #end
>
> -#**
> - * Display list of referrers.
> - *#
> -#macro(showReferrersList $refs $max $maxWidth $includeHits)
> - <ul class="rReferersList">
> - #foreach( $ref in $refs )
> - #if ($velocityCount <= $max)
> - <li class="rReferersListItem">
> -
> - #set( $qq = '"' )
> - #set( $myUrl = $utils.escapeHTML( $ref.RefererUrl ) )
> - #set( $displayUrl = $myUrl )
> - #set( $restOfUrl = "" )
> - #set( $displayLink = "" )
> - #if ( $displayUrl.startsWith("http://") )
> - #set( $displayUrl = $displayUrl.substring( 7 ) )
> - #end
> - #if ( $displayUrl.length() > $maxWidth )
> - #set( $restOfUrl = "...$displayUrl.substring($maxWidth, $displayUrl.length())" )
> - #set( $displayUrl = $displayUrl.substring(0, $maxWidth) )
> - #end
> - #if ( $myUrl.startsWith("http://") )
> - #set( $displayLink = "<a rel=${qq}nofollow${qq} href=${qq}$myUrl${qq}" )
> - #if ( $restOfUrl )
> - #set( $displayLink = "$displayLink title=${qq}$restOfUrl${qq}" )
> - #end
> - #set( $displayLink = "$displayLink >" )
> - #end
> - #set( $displayLink = "$displayLink$displayUrl" )
> - #if ( $includeHits )
> - #set( $displayLink = "$displayLink ($ref.DayHits)" )
> - #end
> - #if ( $myUrl.startsWith("http://") )
> - #set( $displayLink = "$displayLink</a>" )
> - #end
> - $displayLink
> -
> - </li>
> - #end
> - #end
> - </ul>
> -#end
> -
>
> #**
> * Show list of all RSS feeds available for weblog.
>
> Modified: roller/branches/rome2/app/src/main/webapp/theme/scripts/roller.js
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/theme/scripts/roller.js?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/theme/scripts/roller.js (original)
> +++ roller/branches/rome2/app/src/main/webapp/theme/scripts/roller.js Sun Jun 8 20:23:32 2014
> @@ -196,11 +196,7 @@ function toggleFunction(toggle,name) {;
> var inputs = document.getElementsByName(name);
> for(var i = 0; i < inputs.length ; i++) {
> if(inputs[i].type == 'checkbox' && inputs[i].disabled == false) {
> - if (inputs[i].checked == true){
> - inputs[i].checked = !inputs[i].checked;
> - } else{
> - inputs[i].checked = toggle;
> - }
> + inputs[i].checked = toggle;
> }
> }
> };
> \ No newline at end of file
>
> Modified: roller/branches/rome2/app/src/main/webapp/themes/base.css
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/base.css?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/themes/base.css (original)
> +++ roller/branches/rome2/app/src/main/webapp/themes/base.css Sun Jun 8 20:23:32 2014
> @@ -1,20 +1,20 @@
> -/*
> -* Licensed to the Apache Software Foundation (ASF) under one or more
> -* contributor license agreements. The ASF licenses this file to You
> -* under the Apache License, Version 2.0 (the "License"); you may not
> -* use this file except in compliance with the License.
> -* You may obtain a copy of the License at
> -*
> -* http://www.apache.org/licenses/LICENSE-2.0
> -*
> -* Unless required by applicable law or agreed to in writing, software
> -* distributed under the License is distributed on an "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -* See the License for the specific language governing permissions and
> -* limitations under the License. For additional information regarding
> -* copyright in this work, please see the NOTICE file in the top level
> -* directory of this distribution.
> -*/
> +/*
> +* Licensed to the Apache Software Foundation (ASF) under one or more
> +* contributor license agreements. The ASF licenses this file to You
> +* under the Apache License, Version 2.0 (the "License"); you may not
> +* use this file except in compliance with the License.
> +* You may obtain a copy of the License at
> +*
> +* http://www.apache.org/licenses/LICENSE-2.0
> +*
> +* Unless required by applicable law or agreed to in writing, software
> +* distributed under the License is distributed on an "AS IS" BASIS,
> +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +* See the License for the specific language governing permissions and
> +* limitations under the License. For additional information regarding
> +* copyright in this work, please see the NOTICE file in the top level
> +* directory of this distribution.
> +*/
>
> /* Common CSS */
>
> @@ -119,21 +119,6 @@ span.rNewsfeedDesc {
> font-weight: normal;
> }
>
> -/* referer.vm */
> -
> -ul.rReferersList {
> - list-style: none;
> - margin-left: 0;
> - padding-left: 0;
> -}
> -li.rReferersListItem {
> - font-size : small;
> - font-weight: normal;
> -}
> -a.linkback {
> - border-style: double;
> -}
> -
> /* comments.vm */
>
> a.entrycommentslink {
>
> Modified: roller/branches/rome2/app/src/main/webapp/themes/basic/basic-custom.css
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/basic/basic-custom.css?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/themes/basic/basic-custom.css (original)
> +++ roller/branches/rome2/app/src/main/webapp/themes/basic/basic-custom.css Sun Jun 8 20:23:32 2014
> @@ -63,7 +63,7 @@ li.selected {
>
> /* other lists ----------------------------------------------- */
>
> -ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
> +ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rEntriesList {
> list-style-type: none;
> padding: 0;
> margin: 0;
>
> Modified: roller/branches/rome2/app/src/main/webapp/themes/basic/sidebar.vm
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/basic/sidebar.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/themes/basic/sidebar.vm (original)
> +++ roller/branches/rome2/app/src/main/webapp/themes/basic/sidebar.vm Sun Jun 8 20:23:32 2014
> @@ -30,9 +30,3 @@
> #showPageMenu($model.weblog)
> #showAuthorMenu(true)
> </div>
> -
> - <h2>Referrers</h2>
> - <div class="sidebar">
> - #set($refs = $model.weblog.getTodaysReferrers())
> - #showReferrersList($refs 30 20 true)
> - </div>
>
> Modified: roller/branches/rome2/app/src/main/webapp/themes/basic/weblog.vm
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/basic/weblog.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/themes/basic/weblog.vm (original)
> +++ roller/branches/rome2/app/src/main/webapp/themes/basic/weblog.vm Sun Jun 8 20:23:32 2014
> @@ -4,6 +4,7 @@
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <title>$model.weblog.name</title>
> #showAutodiscoveryLinks($model.weblog)
> + #showAnalyticsTrackingCode($model.weblog)
> <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
> #showMetaDescription()
> </head>
>
> Modified: roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css (original)
> +++ roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css Sun Jun 8 20:23:32 2014
> @@ -61,7 +61,7 @@ li.selected {
>
> /* other lists ----------------------------------------------- */
>
> -ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
> +ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rEntriesList {
> list-style-type: none;
> padding: 0;
> margin: 0;
>
> Modified: roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/weblog.vm
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/weblog.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/weblog.vm (original)
> +++ roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/weblog.vm Sun Jun 8 20:23:32 2014
> @@ -4,6 +4,7 @@
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <title>$model.weblog.name</title>
> #showAutodiscoveryLinks($model.weblog)
> + #showAnalyticsTrackingCode($model.weblog)
> <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
> #showMetaDescription()
> </head>
>
> Modified: roller/branches/rome2/app/src/main/webapp/themes/fauxcoly/weblog.vm
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/fauxcoly/weblog.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/themes/fauxcoly/weblog.vm (original)
> +++ roller/branches/rome2/app/src/main/webapp/themes/fauxcoly/weblog.vm Sun Jun 8 20:23:32 2014
> @@ -5,6 +5,7 @@
> #includeTemplate($model.weblog "standard_head")
> <title>$model.weblog.name: $model.weblog.description</title>
> #showAutodiscoveryLinks($model.weblog)
> + #showAnalyticsTrackingCode($model.weblog)
> <link rel="stylesheet" type="text/css" href='$url.page("custom.css")' />
> #showMetaDescription()
> </head>
>
> Modified: roller/branches/rome2/app/src/main/webapp/themes/sotto/sotto-custom.css
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/sotto/sotto-custom.css?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/themes/sotto/sotto-custom.css (original)
> +++ roller/branches/rome2/app/src/main/webapp/themes/sotto/sotto-custom.css Sun Jun 8 20:23:32 2014
> @@ -71,7 +71,7 @@ li.selected {
>
> /* other lists ----------------------------------------------- */
>
> -ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
> +ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rEntriesList {
> list-style-type: none;
> padding: 0;
> margin: 0;
>
> Modified: roller/branches/rome2/app/src/main/webapp/themes/sotto/weblog.vm
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/themes/sotto/weblog.vm?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/webapp/themes/sotto/weblog.vm (original)
> +++ roller/branches/rome2/app/src/main/webapp/themes/sotto/weblog.vm Sun Jun 8 20:23:32 2014
> @@ -6,6 +6,7 @@
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <title>$model.weblog.name</title>
> #showAutodiscoveryLinks($model.weblog)
> + #showAnalyticsTrackingCode($model.weblog)
> <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
> #showMetaDescription()
> </head>
>
> Modified: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java (original)
> +++ roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java Sun Jun 8 20:23:32 2014
> @@ -43,11 +43,14 @@ import org.apache.roller.weblogger.pojos
> import org.apache.roller.weblogger.pojos.User;
> import org.apache.roller.weblogger.pojos.Weblog;
> import org.apache.roller.weblogger.util.RollerMessages;
> +import org.junit.FixMethodOrder;
> import org.junit.Test;
> +import org.junit.runners.MethodSorters;
>
> /**
> * Test media file related business operations.
> */
> +@FixMethodOrder(MethodSorters.NAME_ASCENDING)
> public class MediaFileTest extends TestCase {
>
> public static Log log = LogFactory.getLog(MediaFileTest.class);
> @@ -95,34 +98,28 @@ public class MediaFileTest extends TestC
>
> testWeblog = TestUtils.getManagedWebsite(testWeblog);
>
> - // no need to create root directory, that is done automatically now
> - // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
> - // "root", "root d", testWeblog);
> - // mfMgr.createMediaFileDirectory(rootDirectory);
> - // assertNotNull(rootDirectory.getId() != null);
> -
> TestUtils.endSession(true);
>
> testWeblog = TestUtils.getManagedWebsite(testWeblog);
>
> try {
> - mfMgr.createMediaFileDirectoryByPath(testWeblog, "");
> + mfMgr.createMediaFileDirectory(testWeblog, "");
> assertTrue(false);
> } catch (WebloggerException e) {
> assertTrue(true);
> }
>
> try {
> - mfMgr.createMediaFileDirectoryByPath(testWeblog, "/");
> + mfMgr.createMediaFileDirectory(testWeblog, "default");
> assertTrue(false);
> } catch (WebloggerException e) {
> assertTrue(true);
> }
>
> MediaFileDirectory newDirectory1 = mfMgr
> - .createMediaFileDirectoryByPath(testWeblog, "/test1");
> + .createMediaFileDirectory(testWeblog, "test1");
> MediaFileDirectory newDirectory2 = mfMgr
> - .createMediaFileDirectoryByPath(testWeblog, "/test2/");
> + .createMediaFileDirectory(testWeblog, "test2");
> TestUtils.endSession(true);
>
> testWeblog = TestUtils.getManagedWebsite(testWeblog);
> @@ -137,39 +134,14 @@ public class MediaFileTest extends TestC
>
> // show throw error when creating directory that already exists
> try {
> - mfMgr.createMediaFileDirectoryByPath(testWeblog, "test1");
> + mfMgr.createMediaFileDirectory(testWeblog, "test1");
> assertTrue(false);
> } catch (WebloggerException e) {
> assertTrue(true);
> }
>
> - MediaFileDirectory newDirectory3 = mfMgr
> - .createMediaFileDirectoryByPath(testWeblog, "/test1/test2");
> - TestUtils.endSession(true);
> -
> - testWeblog = TestUtils.getManagedWebsite(testWeblog);
> - MediaFileDirectory newDirectory3ById = mfMgr
> - .getMediaFileDirectory(newDirectory3.getId());
> - assertEquals(newDirectory3, newDirectory3ById);
> -
> - MediaFileDirectory newDirectory4 = mfMgr
> - .createMediaFileDirectoryByPath(testWeblog,
> - "/test1/test2/test3");
> TestUtils.endSession(true);
> -
> testWeblog = TestUtils.getManagedWebsite(testWeblog);
> - MediaFileDirectory newDirectory4ById = mfMgr
> - .getMediaFileDirectory(newDirectory4.getId());
> - assertEquals(newDirectory4, newDirectory4ById);
> -
> - // show throw error when creating directory that already exists
> - try {
> - mfMgr.createMediaFileDirectoryByPath(testWeblog,
> - "/test1/test2/test3");
> - assertTrue(false);
> - } catch (WebloggerException e) {
> - assertTrue(true);
> - }
>
> TestUtils.endSession(true);
> TestUtils.teardownWeblog(testWeblog.getId());
> @@ -207,13 +179,7 @@ public class MediaFileTest extends TestC
>
> // no need to create root directory, that is done automatically now
> MediaFileDirectory directory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> -
> - // MediaFileDirectory directory = new MediaFileDirectory(null, "root",
> - // "root d", testWeblog);
> - // mfMgr.createMediaFileDirectory(directory);
> - // assertEquals("/", directory.getPath());
> - // assertNotNull(directory.getId() != null);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> TestUtils.endSession(true);
>
> @@ -223,7 +189,7 @@ public class MediaFileTest extends TestC
>
> testWeblog = TestUtils.getManagedWebsite(testWeblog);
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> + .getDefaultMediaFileDirectory(testWeblog);
> assertEquals(directory, rootDirectory);
>
> TestUtils.endSession(true);
> @@ -247,21 +213,15 @@ public class MediaFileTest extends TestC
>
> // no need to create root directory, that is done automatically now
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> - // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
> - // "root", "root d", testWeblog);
> - // mfMgr.createMediaFileDirectory(rootDirectory);
> -
> - MediaFileDirectory directory2 = new MediaFileDirectory(rootDirectory,
> - "dir2", "directory 2", testWeblog);
> + MediaFileDirectory directory2 = new MediaFileDirectory(testWeblog,
> + "dir2", "directory 2" );
> mfMgr.createMediaFileDirectory(directory2);
> - rootDirectory.getChildDirectories().add(directory2);
>
> - MediaFileDirectory directory3 = new MediaFileDirectory(rootDirectory,
> - "dir3", "directory 3", testWeblog);
> + MediaFileDirectory directory3 = new MediaFileDirectory(testWeblog,
> + "dir3", "directory 3");
> mfMgr.createMediaFileDirectory(directory3);
> - rootDirectory.getChildDirectories().add(directory3);
>
> TestUtils.endSession(true);
>
> @@ -270,9 +230,9 @@ public class MediaFileTest extends TestC
> .getMediaFileDirectories(testWeblog);
> assertNotNull(directories);
> assertEquals(3, directories.size());
> - assertTrue(containsPath(directories, "/"));
> - assertTrue(containsPath(directories, "/dir2"));
> - assertTrue(containsPath(directories, "/dir3"));
> + assertTrue(containsName(directories, "default"));
> + assertTrue(containsName(directories, "dir2"));
> + assertTrue(containsName(directories, "dir3"));
>
> TestUtils.endSession(true);
> TestUtils.teardownWeblog(testWeblog.getId());
> @@ -285,10 +245,10 @@ public class MediaFileTest extends TestC
> * a directory of given path.
> *
> */
> - private boolean containsPath(Collection<MediaFileDirectory> directories,
> - String path) {
> + private boolean containsName(Collection<MediaFileDirectory> directories,
> + String name) {
> for (MediaFileDirectory directory : directories) {
> - if (path.equals(directory.getPath())) {
> + if (name.equals(directory.getName())) {
> return true;
> }
> }
> @@ -326,11 +286,7 @@ public class MediaFileTest extends TestC
>
> // no need to create root directory, that is done automatically now
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> -
> - // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
> - // "root", "root d", testWeblog);
> - // mfMgr.createMediaFileDirectory(rootDirectory);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> TestUtils.endSession(true);
>
> @@ -391,8 +347,8 @@ public class MediaFileTest extends TestC
> */
> public void testCreateMediaFile() throws Exception {
>
> - User testUser = null;
> - Weblog testWeblog = null;
> + User testUser;
> + Weblog testWeblog;
> testUser = TestUtils.setupUser("mediaFileTestUser3");
> testWeblog = TestUtils.setupWeblog("mediaFileTestWeblog3", testUser);
>
> @@ -401,11 +357,7 @@ public class MediaFileTest extends TestC
>
> // no need to create root directory, that is done automatically now
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> -
> - // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
> - // "root", "root d", testWeblog);
> - // mfMgr.createMediaFileDirectory(rootDirectory);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> TestUtils.endSession(true);
>
> @@ -459,7 +411,7 @@ public class MediaFileTest extends TestC
>
> testWeblog = TestUtils.getManagedWebsite(testWeblog);
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> try {
>
> @@ -567,10 +519,10 @@ public class MediaFileTest extends TestC
> filter2.setName("test_home.jpg");
> searchResults = mfMgr.searchMediaFiles(testWeblog, filter2);
> assertFalse(searchResults.isEmpty());
> - assertEquals(id2, ((MediaFile) searchResults.get(0)).getId());
> - assertNotNull(((MediaFile) searchResults.get(0)).getDirectory());
> - assertEquals("/", ((MediaFile) searchResults.get(0)).getDirectory()
> - .getPath());
> + assertEquals(id2, (searchResults.get(0)).getId());
> + assertNotNull((searchResults.get(0)).getDirectory());
> + assertEquals("default", (searchResults.get(0)).getDirectory()
> + .getName());
>
> MediaFileFilter filter3 = new MediaFileFilter();
> filter3.setName("test_work.jpg");
> @@ -684,12 +636,7 @@ public class MediaFileTest extends TestC
>
> // no need to create root directory, that is done automatically now
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> -
> - // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
> - // "root", "root d", testWeblog);
> - // mfMgr.createMediaFileDirectory(rootDirectory);
> - // TestUtils.endSession(true);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> for (int i = 0; i < 15; i++) {
> rootDirectory = mfMgr.getMediaFileDirectory(rootDirectory
> @@ -778,11 +725,7 @@ public class MediaFileTest extends TestC
>
> // no need to create root directory, that is done automatically now
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> -
> - // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
> - // "root", "root d", testWeblog);
> - // mfMgr.createMediaFileDirectory(rootDirectory);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> TestUtils.endSession(true);
>
> @@ -871,11 +814,7 @@ public class MediaFileTest extends TestC
>
> // no need to create root directory, that is done automatically now
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> -
> - // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
> - // "root", "root d", testWeblog);
> - // mfMgr.createMediaFileDirectory(rootDirectory);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> TestUtils.endSession(true);
>
> @@ -942,27 +881,20 @@ public class MediaFileTest extends TestC
>
> // no need to create root directory, that is done automatically now
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> -
> - // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
> - // "root", "root d", testWeblog);
> - // mfMgr.createMediaFileDirectory(rootDirectory);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> - MediaFileDirectory directory1 = new MediaFileDirectory(rootDirectory,
> - "dir1", "directory 1", testWeblog);
> + MediaFileDirectory directory1 = new MediaFileDirectory(testWeblog,
> + "dir1", "directory 1");
> mfMgr.createMediaFileDirectory(directory1);
> - rootDirectory.getChildDirectories().add(directory1);
>
> - MediaFileDirectory directory2 = new MediaFileDirectory(rootDirectory,
> - "dir2", "directory 2", testWeblog);
> + MediaFileDirectory directory2 = new MediaFileDirectory(testWeblog,
> + "dir2", "directory 2");
> mfMgr.createMediaFileDirectory(directory2);
> - rootDirectory.getChildDirectories().add(directory2);
>
> - MediaFileDirectory directory3 = new MediaFileDirectory(rootDirectory,
> - "dir3", "directory 3", testWeblog);
> + MediaFileDirectory directory3 = new MediaFileDirectory(testWeblog,
> + "dir3", "directory 3");
> mfMgr.createMediaFileDirectory(directory3);
> - rootDirectory.getChildDirectories().add(directory3);
> -
> +
> TestUtils.endSession(true);
>
> testWeblog = TestUtils.getManagedWebsite(testWeblog);
> @@ -999,12 +931,12 @@ public class MediaFileTest extends TestC
> testWeblog = TestUtils.getManagedWebsite(testWeblog);
> rootDirectory = mfMgr.getMediaFileDirectory(rootDirectory.getId());
>
> - Set<MediaFileDirectory> childDirectories = rootDirectory
> - .getChildDirectories();
> - assertEquals(3, childDirectories.size());
> - assertTrue(containsPath(childDirectories, "/dir1"));
> - assertTrue(containsPath(childDirectories, "/dir2"));
> - assertTrue(containsPath(childDirectories, "/dir3"));
> + List<MediaFileDirectory> childDirectories = testWeblog
> + .getMediaFileDirectories();
> + assertEquals(4, childDirectories.size());
> + assertTrue(containsName(childDirectories, "dir1"));
> + assertTrue(containsName(childDirectories, "dir2"));
> + assertTrue(containsName(childDirectories, "dir3"));
>
> Set<MediaFile> mediaFiles = rootDirectory.getMediaFiles();
> assertEquals(2, mediaFiles.size());
> @@ -1037,27 +969,21 @@ public class MediaFileTest extends TestC
>
> // no need to create root directory, that is done automatically now
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> try {
>
> - // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
> - // "root", "root d", testWeblog);
> - //mfMgr.createMediaFileDirectory(rootDirectory);
> -
> MediaFileDirectory directory1 = new MediaFileDirectory(
> - rootDirectory, "dir1", "directory 1", testWeblog);
> + testWeblog, "dir1", "directory 1");
> mfMgr.createMediaFileDirectory(directory1);
> - rootDirectory.getChildDirectories().add(directory1);
> String dir1Id = directory1.getId();
>
> MediaFileDirectory directory2 = new MediaFileDirectory(
> - rootDirectory, "dir2", "directory 2", testWeblog);
> + testWeblog, "dir2", "directory 2");
> mfMgr.createMediaFileDirectory(directory2);
> - rootDirectory.getChildDirectories().add(directory2);
>
> MediaFileDirectory directory3 = new MediaFileDirectory(
> - rootDirectory, "dir3", "directory 3", testWeblog);
> + testWeblog, "dir3", "directory 3");
> mfMgr.createMediaFileDirectory(directory3);
> //rootDirectory.getChildDirectories().add(directory3);
>
> @@ -1074,8 +1000,7 @@ public class MediaFileTest extends TestC
> mediaFile.setCopyrightText("test 7.1 copyright text");
> mediaFile.setSharedForGallery(false);
> mediaFile.setLength(4000);
> - mediaFile
> - .setInputStream(getClass().getResourceAsStream(TEST_IMAGE));
> + mediaFile.setInputStream(getClass().getResourceAsStream(TEST_IMAGE));
> mediaFile.setContentType("image/jpeg");
> mfMgr.createMediaFile(testWeblog, mediaFile, new RollerMessages());
> //rootDirectory.getMediaFiles().add(mediaFile);
> @@ -1164,11 +1089,11 @@ public class MediaFileTest extends TestC
> // now, let's check to see if migration was successful
>
> MediaFileDirectory root1 = mgr
> - .getMediaFileRootDirectory(testWeblog1);
> + .getDefaultMediaFileDirectory(testWeblog1);
> assertNotNull("testblog1's mediafile dir exists", root1);
> assertNotNull(mgr.getMediaFileByPath(testWeblog1, "/sub1/hawk.jpg"));
> assertNotNull(mgr.getMediaFileByPath(testWeblog1,
> - "/sub1/sub2/nasa.jpg"));
> + "/sub2/nasa.jpg"));
> assertNotNull(mgr.getMediaFileByPath(testWeblog1,
> "/roller50-prop.png"));
>
> @@ -1176,7 +1101,7 @@ public class MediaFileTest extends TestC
> "/sub1/hawk.jpg"));
>
> MediaFileDirectory root2 = mgr
> - .getMediaFileRootDirectory(testWeblog2);
> + .getDefaultMediaFileDirectory(testWeblog2);
> assertNotNull("testblog2's mediafile dir exists", root2);
> assertNotNull(root2.getMediaFile("amsterdam.jpg"));
> assertNotNull(root2.getMediaFile("p47-thunderbolt.jpg"));
> @@ -1220,42 +1145,33 @@ public class MediaFileTest extends TestC
>
> // no need to create root directory, that is done automatically now
> MediaFileDirectory rootDirectory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> + .getDefaultMediaFileDirectory(testWeblog);
>
> - MediaFileDirectory directory1 = new MediaFileDirectory(rootDirectory,
> - "dir1", "directory 1", testWeblog);
> + MediaFileDirectory directory1 = new MediaFileDirectory(testWeblog,
> + "dir1", "directory 1");
> mfMgr.createMediaFileDirectory(directory1);
> - rootDirectory.getChildDirectories().add(directory1);
>
> - MediaFileDirectory directory2 = new MediaFileDirectory(rootDirectory,
> - "dir2", "directory 2", testWeblog);
> + MediaFileDirectory directory2 = new MediaFileDirectory(testWeblog,
> + "dir2", "directory 2");
> mfMgr.createMediaFileDirectory(directory2);
> - rootDirectory.getChildDirectories().add(directory2);
>
> - MediaFileDirectory directory3 = new MediaFileDirectory(rootDirectory,
> - "dir3", "directory 3", testWeblog);
> + MediaFileDirectory directory3 = new MediaFileDirectory(testWeblog,
> + "dir3", "directory 3");
> mfMgr.createMediaFileDirectory(directory3);
> - rootDirectory.getChildDirectories().add(directory3);
>
> TestUtils.endSession(true);
>
> testWeblog = TestUtils.getManagedWebsite(testWeblog);
> rootDirectory = mfMgr.getMediaFileDirectory(rootDirectory.getId());
>
> - Set<MediaFileDirectory> childDirectories = rootDirectory
> - .getChildDirectories();
> + List<MediaFileDirectory> childDirectories = testWeblog.getMediaFileDirectories();
> +
> assertEquals(3, childDirectories.size());
>
> TestUtils.endSession(true);
>
> testWeblog = TestUtils.getManagedWebsite(testWeblog);
>
> - // Using named query MediaFileDirectory.getByWeblogAndNoParent
> - MediaFileDirectory directory = mfMgr
> - .getMediaFileRootDirectory(testWeblog);
> -
> - assertEquals(3, directory.getChildDirectories().size());
> -
> // Delete folder
> MediaFileDirectory directoryById = mfMgr
> .getMediaFileDirectory(directory1.getId());
> @@ -1263,14 +1179,6 @@ public class MediaFileTest extends TestC
> mfMgr.removeMediaFileDirectory(directoryById);
> TestUtils.endSession(true);
>
> - directory = null;
> -
> - // Using named query again MediaFileDirectory.getByWeblogAndNoParent
> - directory = mfMgr.getMediaFileRootDirectory(testWeblog);
> -
> - // There should only be two, the database only has two.
> - assertEquals(2, directory.getChildDirectories().size());
> -
> TestUtils.endSession(true);
> TestUtils.teardownWeblog(testWeblog.getId());
> TestUtils.teardownUser(testUser.getUserName());
>
> Modified: roller/branches/rome2/app/src/test/resources/roller-custom.properties
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/resources/roller-custom.properties?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/test/resources/roller-custom.properties (original)
> +++ roller/branches/rome2/app/src/test/resources/roller-custom.properties Sun Jun 8 20:23:32 2014
> @@ -36,7 +36,7 @@ cache.dir=${project.build.directory}/pla
> uploads.migrate.auto=false
>
> # override tasks.enabled so we can add a test task
> -tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,TurnoverReferersTask,PingQueueTask,TestTask
> +tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,PingQueueTask,TestTask
>
> # test task
> tasks.TestTask.class=org.apache.roller.weblogger.business.TestTask
>
> Modified: roller/branches/rome2/app/src/test/resources/roller-jettyrun.properties
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/resources/roller-jettyrun.properties?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/test/resources/roller-jettyrun.properties (original)
> +++ roller/branches/rome2/app/src/test/resources/roller-jettyrun.properties Sun Jun 8 20:23:32 2014
> @@ -37,7 +37,7 @@ log4j.appender.roller.File=${project.bui
> uploads.migrate.auto=false
>
> # override tasks.enabled so we can add a test task
> -tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,TurnoverReferersTask,PingQueueTask,TestTask
> +tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,PingQueueTask,TestTask
>
> # test task
> tasks.TestTask.class=org.apache.roller.weblogger.business.TestTask
>
> Modified: roller/branches/rome2/docs/roller-install-guide.odt
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/roller-install-guide.odt?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> Binary files - no diff available.
>
> Modified: roller/branches/rome2/docs/roller-template-guide.odt
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/roller-template-guide.odt?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> Binary files - no diff available.
>
> Modified: roller/branches/rome2/docs/roller-user-guide.odt
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/roller-user-guide.odt?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> Binary files - no diff available.
>
> Modified: roller/branches/rome2/pom.xml
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/pom.xml?rev=1601254&r1=1601253&r2=1601254&view=diff
> ==============================================================================
> --- roller/branches/rome2/pom.xml (original)
> +++ roller/branches/rome2/pom.xml Sun Jun 8 20:23:32 2014
> @@ -29,7 +29,7 @@
> <properties>
> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
> - <derby.version>10.10.1.1</derby.version>
> + <derby.version>10.10.2.0</derby.version>
> </properties>
>
> <modules>
>
>