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 2012/10/21 16:06:02 UTC
svn commit: r1400648 - in /roller/trunk:
weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/
weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/
weblogger-business/src/main/resources/sql/ weblogger-web/ weblogger-we...
Author: snoopdave
Date: Sun Oct 21 14:06:01 2012
New Revision: 1400648
URL: http://svn.apache.org/viewvc?rev=1400648&view=rev
Log:
Provide a blog entry-level description field that can go into HTML header field
https://issues.apache.org/jira/browse/ROL-1947
Thanks to Glen Mazza!
Plus some changes to remove Servlet 2.4 dependency that was causing problems with mvn jetty:run
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
roller/trunk/weblogger-business/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/weblogger-business/src/main/resources/sql/createdb.vm
roller/trunk/weblogger-web/pom.xml
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
roller/trunk/weblogger-webapp/pom.xml
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?rev=1400648&r1=1400647&r2=1400648&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Sun Oct 21 14:06:01 2012
@@ -95,6 +95,7 @@ public class WeblogEntry implements Seri
private String status = DRAFT;
private String locale = null;
private String creatorUserName = null;
+ private String searchDescription = null;
// Associated objects
private Weblog website = null;
@@ -155,6 +156,8 @@ public class WeblogEntry implements Seri
this.setTitle(other.getTitle());
this.setLink(other.getLink());
this.setText(other.getText());
+ this.setSummary(other.getSummary());
+ this.setSearchDescription(other.getSearchDescription());
this.setAnchor(other.getAnchor());
this.setPubTime(other.getPubTime());
this.setUpdateTime(other.getUpdateTime());
@@ -313,6 +316,24 @@ public class WeblogEntry implements Seri
}
/**
+ * Get search description for weblog entry.
+ * @roller.wrapPojoMethod type="simple"
+ * @ejb:persistent-field
+ * @hibernate.property column="search_description" non-null="false" unique="false"
+ */
+ public String getSearchDescription() {
+ return searchDescription;
+ }
+
+ /**
+ * Set search description for weblog entry
+ * @ejb:persistent-field
+ */
+ public void setSearchDescription(String searchDescription) {
+ this.searchDescription = searchDescription;
+ }
+
+ /**
* Get content text for weblog entry (maps to RSS content:encoded and Atom content).
* @roller.wrapPojoMethod type="simple"
* @ejb:persistent-field
Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml?rev=1400648&r1=1400647&r2=1400648&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml Sun Oct 21 14:06:01 2012
@@ -93,6 +93,9 @@
<basic name="text">
<column name="text" insertable="true" updatable="true" unique="false"/>
</basic>
+ <basic name="searchDescription">
+ <column name="search_description" insertable="true" updatable="true" unique="false"/>
+ </basic>
<basic name="contentType">
<column name="content_type" insertable="true" updatable="true" unique="false"/>
</basic>
Modified: roller/trunk/weblogger-business/src/main/resources/sql/500-to-510-migration.vm
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/sql/500-to-510-migration.vm?rev=1400648&r1=1400647&r2=1400648&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/sql/500-to-510-migration.vm (original)
+++ roller/trunk/weblogger-business/src/main/resources/sql/500-to-510-migration.vm Sun Oct 21 14:06:01 2012
@@ -22,5 +22,4 @@ create table rol_templatecode (
);
#addColumnNull("webpage" "type" "varchar(16)")
-
-
+#addColumnNull("weblogentry" "search_description" "varchar(255)")
Modified: roller/trunk/weblogger-business/src/main/resources/sql/createdb.vm
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/sql/createdb.vm?rev=1400648&r1=1400647&r2=1400648&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/weblogger-business/src/main/resources/sql/createdb.vm Sun Oct 21 14:06:01 2012
@@ -238,7 +238,8 @@ create table weblogentry (
status varchar(20) not null,
summary $db.TEXT_SQL_TYPE default null,
content_type varchar(48) default null,
- content_src varchar(255) default null
+ content_src varchar(255) default null,
+ search_description varchar(255) default null
);
create index we_websiteid_idx on weblogentry( websiteid );
create index we_categoryid_idx on weblogentry( categoryid );
Modified: roller/trunk/weblogger-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/pom.xml?rev=1400648&r1=1400647&r2=1400648&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Sun Oct 21 14:06:01 2012
@@ -196,6 +196,10 @@
<artifactId>activation</artifactId>
<groupId>javax.activation</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -347,12 +351,6 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?rev=1400648&r1=1400647&r2=1400648&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java Sun Oct 21 14:06:01 2012
@@ -64,6 +64,7 @@ public class EntryBean {
private boolean rightToLeft = false;
private boolean pinnedToMain = false;
private String enclosureURL = null;
+ private String searchDescription = null;
private int commentCount = 0;
@@ -220,6 +221,13 @@ public class EntryBean {
this.enclosureURL = trackbackUrl;
}
+ public String getSearchDescription() {
+ return searchDescription;
+ }
+
+ public void setSearchDescription(String searchDescription) {
+ this.searchDescription = searchDescription;
+ }
// a convenient way to get the final pubtime of the entry
public Timestamp getPubTime(Locale locale, TimeZone timezone) {
@@ -281,6 +289,7 @@ public class EntryBean {
entry.setSummary(getSummary());
entry.setText(getText());
entry.setTagsAsString(getTagsAsString());
+ entry.setSearchDescription(getSearchDescription());
// figure out the category selected
if (getCategoryId() != null) {
@@ -328,6 +337,7 @@ public class EntryBean {
setText(entry.getText());
setCategoryId(entry.getCategory().getId());
setTagsAsString(entry.getTagsAsString());
+ setSearchDescription(entry.getSearchDescription());
// set comment count, ignoreSpam=false, approvedOnly=false
setCommentCount(entry.getComments(false, false).size());
@@ -390,8 +400,9 @@ public class EntryBean {
buf.append("hours = ").append(getHours()).append("\n");
buf.append("minutes = ").append(getMinutes()).append("\n");
buf.append("seconds = ").append(getSeconds()).append("\n");
- buf.append("txt size = ").append(getText()).append("\n");
- buf.append("summary size = ").append(getSummary()).append("\n");
+ buf.append("text = ").append(getText()).append("\n");
+ buf.append("summary = ").append(getSummary()).append("\n");
+ buf.append("search description = ").append(getSearchDescription()).append("\n");
buf.append("comments = ").append(getAllowComments()).append("\n");
buf.append("commentDays = ").append(getCommentDays()).append("\n");
buf.append("plugins = ").append(getPlugins()).append("\n");
Modified: roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties?rev=1400648&r1=1400647&r2=1400648&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties Sun Oct 21 14:06:01 2012
@@ -2090,6 +2090,7 @@ weblogEdit.miscSettings=Advanced Setting
weblogEdit.rightToLeft=Text reads right-to-left
weblogEdit.pinnedToMain=Pinned to main
+weblogEdit.searchDescription=Search Description
weblogEdit.trackback=Trackback
weblogEdit.trackbacks=Trackbacks
Modified: roller/trunk/weblogger-webapp/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/pom.xml?rev=1400648&r1=1400647&r2=1400648&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/pom.xml (original)
+++ roller/trunk/weblogger-webapp/pom.xml Sun Oct 21 14:06:01 2012
@@ -23,6 +23,12 @@
<groupId>org.apache.roller</groupId>
<artifactId>roller-weblogger-web</artifactId>
<version>5.1.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp?rev=1400648&r1=1400647&r2=1400648&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp Sun Oct 21 14:06:01 2012
@@ -193,7 +193,17 @@
</s:if>
<br />
- <s:text name="weblogEdit.enclosureURL" />: <s:textfield name="bean.enclosureURL" size="40" maxlength="255" />
+ <table>
+ <tr>
+ <td> <s:text name="weblogEdit.searchDescription" />: </td>
+ <td> <s:textfield name="bean.searchDescription" size="60" maxlength="255" /> </td>
+ </tr>
+ <tr>
+ <td> <s:text name="weblogEdit.enclosureURL" />: </td>
+ <td> <s:textfield name="bean.enclosureURL" size="40" maxlength="255" /> </td>
+ </tr>
+ </table>
+
</div>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp?rev=1400648&r1=1400647&r2=1400648&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp Sun Oct 21 14:06:01 2012
@@ -243,12 +243,23 @@ function fullPreviewMode() {
<br />
</s:if>
<br />
-
- <s:text name="weblogEdit.enclosureURL" />: <s:textfield name="bean.enclosureURL" size="40" maxlength="255" />
- <s:if test="bean.enclosureURL != null">
- <s:text name="weblogEdit.enclosureType" />: <s:property value='entry.findEntryAttribute("att_mediacast_type")' />
- <s:text name="weblogEdit.enclosureLength" />: <s:property value='entry.findEntryAttribute("att_mediacast_length")' />
- </s:if>
+
+ <table>
+ <tr>
+ <td><s:text name="weblogEdit.searchDescription" />:</td>
+ <td><s:textfield name="bean.searchDescription" size="60" maxlength="255" /> </td>
+ </tr>
+ <tr>
+ <td><s:text name="weblogEdit.enclosureURL" />: </td>
+ <td><s:textfield name="bean.enclosureURL" size="40" maxlength="255" /></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><s:if test="bean.enclosureURL != null">
+ <s:text name="weblogEdit.enclosureType" />: <s:property value='entry.findEntryAttribute("att_mediacast_type")' />
+ <s:text name="weblogEdit.enclosureLength" />: <s:property value='entry.findEntryAttribute("att_mediacast_length")' />
+ </s:if></td>
+ </table>
</div>