You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/14 14:37:07 UTC
svn commit: r1610402 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/business/
java/org/apache/roller/weblogger/business/jpa/
java/org/apache/roller/weblogger/pojos/ resources/META-INF/
resources/org/apache/roller/weblogger/pojos/ res...
Author: gmazza
Date: Mon Jul 14 12:37:07 2014
New Revision: 1610402
URL: http://svn.apache.org/r1610402
Log:
ROL-2038 (WIP) Removed unused roller_weblogtheme table and associated artifacts.
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/app/src/main/resources/META-INF/persistence.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/createdb.vm
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java?rev=1610402&r1=1610401&r2=1610402&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java Mon Jul 14 12:37:07 2014
@@ -26,7 +26,6 @@ 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.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.pojos.WeblogThemeAssoc;
import org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode;
@@ -49,19 +48,10 @@ public interface WeblogManager {
void saveWeblog(Weblog data) throws WebloggerException;
/**
- * Save new theme associativity for Weblog
- * @param themeAssoc
- * @throws WebloggerException
- */
- void saveThemeAssoc(WeblogThemeAssoc themeAssoc) throws WebloggerException;
-
-
- /**
* Remove website object.
*/
void removeWeblog(Weblog website) throws WebloggerException;
-
/**
* Get website object by name.
*/
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1610402&r1=1610401&r2=1610402&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Mon Jul 14 12:37:07 2014
@@ -53,7 +53,6 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.WeblogEntryTagAggregate;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.pojos.WeblogThemeAssoc;
import org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode;
@@ -117,15 +116,6 @@ public class JPAWeblogManagerImpl implem
UserManager umgr = roller.getUserManager();
WeblogEntryManager emgr = roller.getWeblogEntryManager();
- //remove theme Assocs
- TypedQuery<WeblogThemeAssoc> themeAssocQuery = strategy.getNamedQuery("WeblogThemeAssoc.getThemeAssocsByWeblog",
- WeblogThemeAssoc.class);
- themeAssocQuery.setParameter(1,website);
- List<WeblogThemeAssoc> assocResults = themeAssocQuery.getResultList();
- for (WeblogThemeAssoc themeAssoc : assocResults) {
- this.strategy.remove(themeAssoc);
- }
-
// remove tags
TypedQuery<WeblogEntryTag> tagQuery = strategy.getNamedQuery("WeblogEntryTag.getByWeblog",
WeblogEntryTag.class);
@@ -469,13 +459,6 @@ public class JPAWeblogManagerImpl implem
return query.getResultList();
}
- public void saveThemeAssoc(WeblogThemeAssoc themeAssoc) throws WebloggerException {
- this.strategy.store(themeAssoc);
-
- // update weblog last modified date. date updated by saveWebsite()
- roller.getWeblogManager().saveWeblog(themeAssoc.getWeblog());
- }
-
public List<Weblog> getUserWeblogs(User user, boolean enabledOnly) throws WebloggerException {
List<Weblog> weblogs = new ArrayList<Weblog>();
if (user == null) {
Modified: roller/trunk/app/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/META-INF/persistence.xml?rev=1610402&r1=1610401&r2=1610402&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/META-INF/persistence.xml (original)
+++ roller/trunk/app/src/main/resources/META-INF/persistence.xml Mon Jul 14 12:37:07 2014
@@ -34,7 +34,6 @@
<mapping-file>org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml</mapping-file>
<mapping-file>org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml</mapping-file>
<mapping-file>org/apache/roller/weblogger/pojos/AutoPing.orm.xml</mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml</mapping-file>
<mapping-file>org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml</mapping-file>
<mapping-file>org/apache/roller/planet/pojos/Planet.orm.xml</mapping-file>
Modified: roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm?rev=1610402&r1=1610401&r2=1610402&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm (original)
+++ roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm Mon Jul 14 12:37:07 2014
@@ -4,13 +4,6 @@
DON'T RUN THIS, IT'S NOT A DATABASE CREATION SCRIPT!!!
**#
-create table roller_weblogtheme (
- id varchar(48) not null primary key,
- weblogid varchar(48) not null,
- name varchar(255) not null,
- custom $db.BOOLEAN_SQL_TYPE_FALSE not null
-);
-
create table roller_templatecode (
id varchar(48) not null primary key,
templateid varchar(48) not null,
Modified: roller/trunk/app/src/main/resources/sql/createdb.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/createdb.vm?rev=1610402&r1=1610401&r2=1610402&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/app/src/main/resources/sql/createdb.vm Mon Jul 14 12:37:07 2014
@@ -142,14 +142,6 @@ alter table website add constraint ws_ha
-- This index is not necessary because of handle is already a primary key.
-- create index ws_handle_idx on website(handle);
-
-create table roller_weblogtheme (
- id varchar(48) not null primary key,
- weblogid varchar(48) not null,
- name varchar(255) not null,
- custom $db.BOOLEAN_SQL_TYPE_FALSE not null
-);
-
create table roller_templatecode (
id varchar(48) not null primary key,
templateid varchar(48) not null,