roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1506595 - in /roller/trunk/app: ./ src/main/java/org/apache/roller/planet/pojos/ src/main/java/org/apache/roller/weblogger/pojos/ src/main/resources/META-INF/ src/main/resources/org/apache/roller/planet/pojos/ src/main/resources/org/apache...
Date Wed, 24 Jul 2013 15:23:39 GMT
Author: gmazza
Date: Wed Jul 24 15:23:38 2013
New Revision: 1506595

URL: http://svn.apache.org/r1506595
Log:
More JPA changes necessary for Roller to work OOTB on JBoss' Hibernate implementation (conversion from annotations to JPA XML mapping files for the three entity classes using them turned out not to be necessary but kept change anyway.)

Added:
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/AutoPing.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml
Modified:
    roller/trunk/app/pom.xml
    roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java
    roller/trunk/app/src/main/resources/META-INF/persistence.xml
    roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml

Modified: roller/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Jul 24 15:23:38 2013
@@ -75,12 +75,21 @@
              with JBoss
              Important: set hibernate.transaction.factory_class=org.hibernate.transaction.JDBCTransactionFactory
              in your roller-custom.properties if using Hibernate with Tomcat
+
+             org.javassist:javassist:3.15.0 cannot replace differently named javassist:javassist:3.11.0
+             always provided by struts2-spring-plugin so filtering it out; already provided by JBoss anyway
         -->
 
         <!--dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
             <version>4.2.1.Final</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -144,8 +153,8 @@
             <version>1.0.2</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>xml-apis</artifactId>
                     <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -383,8 +392,8 @@
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>activation</artifactId>
                     <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java Wed Jul 24 15:23:38 2013
@@ -199,7 +199,7 @@ public class PlanetGroup implements Seri
      * Returns true if entry is qualified for inclusion in this group.
      */
     public boolean qualified(SubscriptionEntry entry) {
-        String[] cats = getCategoryRestrictionAsArray();
+        String[] cats = createCategoryRestrictionAsArray();
         if (cats == null || cats.length == 0) return true;
         for (int i=0; i<cats.length; i++) {
             if (entry.inCategory(cats[i])) return true;
@@ -208,7 +208,7 @@ public class PlanetGroup implements Seri
     }
     
     
-    private String[] getCategoryRestrictionAsArray() {
+    private String[] createCategoryRestrictionAsArray() {
         if (catArray == null && getCategoryRestriction() != null) {
             StringTokenizer toker = new StringTokenizer(getCategoryRestriction(),",");
             catArray = new String[toker.countTokens()];

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java Wed Jul 24 15:23:38 2013
@@ -19,14 +19,6 @@
 package org.apache.roller.weblogger.pojos;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.roller.util.UUIDGenerator;
@@ -42,27 +34,6 @@ import org.apache.roller.util.UUIDGenera
  * changes.
  * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */
-@Entity
-@Table(name="autoping")
-@NamedQueries({
-    @NamedQuery(name="AutoPing.getAll",
-        query="SELECT a FROM AutoPing a"),
-
-    @NamedQuery(name="AutoPing.getByPingTarget",
-        query="SELECT a FROM AutoPing a WHERE a.pingTarget = ?1"),
-
-    @NamedQuery(name="AutoPing.getByWebsite",
-        query="SELECT a FROM AutoPing a WHERE a.website = ?1"),
-
-    @NamedQuery(name="AutoPing.removeByPingTarget",
-        query="DELETE FROM AutoPing a WHERE a.pingTarget = ?1"),
-
-    @NamedQuery(name="AutoPing.removeByPingTarget&Website",
-        query="DELETE FROM AutoPing a WHERE a.pingTarget = ?1 AND a.website = ?2"),
-
-    @NamedQuery(name="AutoPing.removeAll",
-        query="DELETE FROM AutoPing a")
-})
 public class AutoPing implements Serializable {
 
     private String id = UUIDGenerator.generateUUID();
@@ -94,8 +65,6 @@ public class AutoPing implements Seriali
      * Get the unique id (primary key) of this object.
      * @return the unique id of this object. 
      */
-    @Id
-    @Column(nullable=false,updatable=false)
     public String getId() {
         return id;
     }
@@ -115,8 +84,6 @@ public class AutoPing implements Seriali
      * to the ping target specified by this object.
      * @return the website.
      */
-    @ManyToOne
-    @JoinColumn(name="websiteid",insertable=true,nullable=true,updatable=true)
     public Weblog getWebsite() {
         return website;
     }
@@ -135,8 +102,6 @@ public class AutoPing implements Seriali
      * corresponding website changes.
      * @return the target to be pinged.
      */
-    @ManyToOne
-    @JoinColumn(name="pingtargetid",insertable=true,nullable=true,updatable=true)
     public PingTarget getPingTarget() {
         return pingTarget;
     }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java Wed Jul 24 15:23:38 2013
@@ -22,24 +22,11 @@ import org.apache.commons.lang.builder.E
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.roller.util.UUIDGenerator;
 
-import javax.persistence.*;
 import java.io.Serializable;
 
 /**
  * pojo that will keep the Associativity of Themes for a weblog
  */
-
-@Entity
-@Table(name="rol_weblogtheme")
-@NamedQueries({
-        @NamedQuery(name = "WeblogThemeAssoc.getThemeAssocByType" ,
-                query = "SELECT a FROM WeblogThemeAssoc a WHERE a.weblog = ?1 AND a.type =?2"
-        ),
-        @NamedQuery(name = "WeblogThemeAssoc.getThemeAssocsByWeblog" ,
-                query = "SELECT a FROM WeblogThemeAssoc a WHERE a.weblog = ?1"
-        )
-}
-)
 public class WeblogThemeAssoc implements Serializable{
 
 
@@ -63,8 +50,7 @@ public class WeblogThemeAssoc implements
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
-    @Id
-    @Column(nullable=false,updatable=false)
+
     public String getId() {
         return id;
     }
@@ -72,8 +58,7 @@ public class WeblogThemeAssoc implements
     public void setId(String id) {
         this.id = id;
     }
-     @ManyToOne
-    @JoinColumn(name="weblogid",nullable=false,updatable=true, insertable=true)
+
     public Weblog getWeblog() {
         return weblog;
     }
@@ -81,8 +66,7 @@ public class WeblogThemeAssoc implements
     public void setWeblog(Weblog weblog) {
         this.weblog = weblog;
     }
-     @Basic
-     @Column(nullable = false,updatable = true,insertable = true)
+
     public String getName() {
         return name;
     }
@@ -90,8 +74,7 @@ public class WeblogThemeAssoc implements
     public void setName(String name) {
         this.name = name;
     }
-      @Basic
-     @Column(nullable = false,updatable = true,insertable = true)
+
     public boolean isCustom() {
         return isCustom;
     }
@@ -99,8 +82,7 @@ public class WeblogThemeAssoc implements
     public void setCustom(boolean custom) {
         isCustom = custom;
     }
-    @Basic
-     @Column(nullable = false,updatable = true,insertable = true)
+
     public String getType() {
         return type;
     }
@@ -109,7 +91,7 @@ public class WeblogThemeAssoc implements
         this.type = type;
     }
 
-     public String toString() {
+    public String toString() {
         StringBuffer buf = new StringBuffer();
         buf.append("{");
         buf.append(getId());

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java Wed Jul 24 15:23:38 2013
@@ -23,24 +23,10 @@ import org.apache.commons.lang.builder.H
 import org.apache.roller.util.UUIDGenerator;
 
 import java.io.Serializable;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
 
 /**
  * A pojo that will maintain different template codes for one template
  */
-
-@Entity
-@Table(name = "rol_templatecode")
-@NamedQueries({
-		@NamedQuery(name = "WeblogThemeTemplateCode.getTemplateCodeByType", query = "SELECT c FROM WeblogThemeTemplateCode c WHERE c.templateId = ?1 AND c.type =?2"),
-
-		@NamedQuery(name = "WeblogThemeTemplateCode.getTemplateCodesByTemplateId", query = "SELECT c FROM WeblogThemeTemplateCode c WHERE c.templateId = ?1 ") })
 public class WeblogThemeTemplateCode implements Serializable, TemplateCode {
 
 	private static final long serialVersionUID = -1497618963802805151L;
@@ -49,7 +35,7 @@ public class WeblogThemeTemplateCode imp
 	// template contents
 	private String template = null;
 	private String type = null;
-	private String ContentType = null;
+	private String contentType = null;
 	private String templateLanguage = null;
 
 	public WeblogThemeTemplateCode(String templateId, String type) {
@@ -60,8 +46,6 @@ public class WeblogThemeTemplateCode imp
 	public WeblogThemeTemplateCode() {
 	}
 
-	@Id
-	@Column(nullable = false, updatable = false)
 	public String getId() {
 		return id;
 	}
@@ -70,8 +54,6 @@ public class WeblogThemeTemplateCode imp
 		this.id = id;
 	}
 
-	@Basic
-	@Column(nullable = false, updatable = true, insertable = true)
 	// @Override
 	public String getTemplate() {
 		return template;
@@ -82,8 +64,6 @@ public class WeblogThemeTemplateCode imp
 		this.template = template;
 	}
 
-	@Basic
-	@Column(nullable = false, updatable = true, insertable = true)
 	// @Override
 	public String getTemplateId() {
 		return templateId;
@@ -94,8 +74,6 @@ public class WeblogThemeTemplateCode imp
 		this.templateId = templateId;
 	}
 
-	@Basic
-	@Column(nullable = false, updatable = true, insertable = true)
 	// @Override
 	public String getType() {
 		return type;
@@ -134,8 +112,6 @@ public class WeblogThemeTemplateCode imp
 				.append(getTemplate()).toHashCode();
 	}
 
-	@Basic
-	@Column(name = "templatelang", unique = false, updatable = true, insertable = true)
 	// @Override
 	public String getTemplateLanguage() {
 		return templateLanguage;
@@ -146,15 +122,13 @@ public class WeblogThemeTemplateCode imp
 		this.templateLanguage = templateLanguage;
 	}
 
-	@Basic
-	@Column(name = "contenttype", unique = false, updatable = true, insertable = true)
 	// @Override
 	public String getContentType() {
-		return ContentType;
+		return contentType;
 	}
 
 	// @Override
 	public void setContentType(String contentType) {
-		ContentType = contentType;
+		this.contentType = contentType;
 	}
 }

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=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/META-INF/persistence.xml (original)
+++ roller/trunk/app/src/main/resources/META-INF/persistence.xml Wed Jul 24 15:23:38 2013
@@ -5,40 +5,42 @@
          Avoiding DB configuration here to allow the same persistence.xml to be used between
          testing and prod (which have different DB configuration)
     -->
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml          </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml      </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml    </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml    </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml          </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml          </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/PingTarget.orm.xml              </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml          </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/UserRole.orm.xml                </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml   </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/TaskLock.orm.xml                </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/User.orm.xml                    </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml          </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml             </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml          </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml          </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml        </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml        </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/Weblog.orm.xml                  </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/UserAttribute.orm.xml           </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml     </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml     </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/MediaFile.orm.xml               </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml            </mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml      </mapping-file>
+
+    <!-- Don't put trailing spaces after the .orm.xml, Hibernate doesn't strip them and
+         hence reports can't-find-the-mapping-file errors -->
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/PingTarget.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/UserRole.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/TaskLock.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/User.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/Weblog.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/UserAttribute.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml</mapping-file>
+    <mapping-file>org/apache/roller/weblogger/pojos/MediaFile.orm.xml</mapping-file>
+    <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>
     <mapping-file>org/apache/roller/planet/pojos/PlanetGroup.orm.xml</mapping-file>
     <mapping-file>org/apache/roller/planet/pojos/Subscription.orm.xml</mapping-file>
     <mapping-file>org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml</mapping-file>
-
-    <class>org.apache.roller.weblogger.pojos.AutoPing</class>
-    <class>org.apache.roller.weblogger.pojos.WeblogThemeAssoc</class>
-    <class>org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode</class>
   </persistence-unit>
 </persistence>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.planet.pojos</package>
     <entity metadata-complete="true" name="Planet"
-            class="org.apache.roller.planet.pojos.Planet">
+            class="org.apache.roller.planet.pojos.Planet" access="PROPERTY">
         <table name="rag_planet"/>
         <named-query name="Planet.getAll">
             <query>SELECT p FROM Planet p</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,14 +2,8 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.planet.pojos</package>
-    <entity metadata-complete="true" name="PlanetGroup" class="org.apache.roller.planet.pojos.PlanetGroup">
+    <entity metadata-complete="true" name="PlanetGroup" class="org.apache.roller.planet.pojos.PlanetGroup" access="PROPERTY">
         <table name="rag_group"/>
         <named-query name="PlanetGroup.getByHandle">
             <query>SELECT p FROM PlanetGroup p WHERE p.handle = ?1</query>
@@ -54,7 +48,6 @@
             <many-to-many name="subscriptions"
                           target-entity="org.apache.roller.planet.pojos.Subscription"
                           mapped-by="groups"/>
-            <transient name="categoryRestrictionAsArray"/>
             <transient name="recentEntries"/>
         </attributes>
     </entity>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.planet.pojos</package>
     <entity metadata-complete="true" name="RuntimeConfigProperty"
-            class="org.apache.roller.planet.pojos.RuntimeConfigProperty">
+            class="org.apache.roller.planet.pojos.RuntimeConfigProperty" access="PROPERTY">
         <table name="rag_properties"/>
         <named-query name="RuntimeConfigProperty.getAll">
             <query>SELECT r FROM RuntimeConfigProperty r</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.planet.pojos</package>
     <entity metadata-complete="true" name="Subscription"
-            class="org.apache.roller.planet.pojos.Subscription">
+            class="org.apache.roller.planet.pojos.Subscription" access="PROPERTY">
         <table name="rag_subscription"/>
         <named-query name="Subscription.getAll">
             <query>SELECT p FROM Subscription p</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,14 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.planet.pojos</package>
-    <entity metadata-complete="true" name="SubscriptionEntry" class="org.apache.roller.planet.pojos.SubscriptionEntry">
+    <entity metadata-complete="true" name="SubscriptionEntry" class="org.apache.roller.planet.pojos.SubscriptionEntry"
+            access="PROPERTY">
         <table name="rag_entry"/>
         <named-query name="SubscriptionEntry.getByFeedURL">
             <query>SELECT p FROM SubscriptionEntry p WHERE p.subscription.feedURL = ?1</query>

Added: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/AutoPing.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/AutoPing.orm.xml?rev=1506595&view=auto
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/AutoPing.orm.xml (added)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/AutoPing.orm.xml Wed Jul 24 15:23:38 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
+    <package>org.apache.roller.weblogger.pojos</package>
+    <entity metadata-complete="true" name="AutoPing"
+            class="org.apache.roller.weblogger.pojos.AutoPing" access="PROPERTY">
+        <table name="autoping"/>
+        <named-query name="AutoPing.getAll">
+            <query>SELECT a FROM AutoPing a</query>
+        </named-query>
+        <named-query name="AutoPing.getByPingTarget">
+            <query>SELECT a FROM AutoPing a WHERE a.pingTarget = ?1</query>
+        </named-query>
+        <named-query name="AutoPing.getByWebsite">
+            <query>SELECT a FROM AutoPing a WHERE a.website = ?1</query>
+        </named-query>
+        <named-query name="AutoPing.removeByPingTarget">
+            <query>DELETE FROM AutoPing a WHERE a.pingTarget = ?1</query>
+        </named-query>
+        <named-query name="AutoPing.removeByPingTarget&amp;Website">
+            <query>DELETE FROM AutoPing a WHERE a.pingTarget = ?1 AND a.website = ?2</query>
+        </named-query>
+        <named-query name="AutoPing.removeAll">
+            <query>DELETE FROM AutoPing a</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <many-to-one name="pingTarget" target-entity="org.apache.roller.weblogger.pojos.PingTarget">
+                <join-column name="pingtargetid" insertable="true" updatable="true" nullable="true"/>
+            </many-to-one>
+            <many-to-one name="website" target-entity="org.apache.roller.weblogger.pojos.Weblog">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="true"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="MediaFile"
-            class="org.apache.roller.weblogger.pojos.MediaFile">
+            class="org.apache.roller.weblogger.pojos.MediaFile" access="PROPERTY">
         <table name="roller_mediafile"/>
         <named-query name="MediaFile.getByWeblogAndOrigpath">
             <query>SELECT f FROM MediaFile f WHERE f.weblog = ?1 AND f.originalPath = ?2</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="MediaFileDirectory"
-            class="org.apache.roller.weblogger.pojos.MediaFileDirectory">
+            class="org.apache.roller.weblogger.pojos.MediaFileDirectory" access="PROPERTY">
         <table name="roller_mediafiledir"/>
         <named-query name="MediaFileDirectory.getByWeblog">
             <query>SELECT d FROM MediaFileDirectory d WHERE d.weblog = ?1</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="MediaFileTag"
-            class="org.apache.roller.weblogger.pojos.MediaFileTag">
+            class="org.apache.roller.weblogger.pojos.MediaFileTag" access="PROPERTY">
         <table name="roller_mediafiletag"/>
         <named-query name="MediaFileTag.getByMediaFile">
             <query>SELECT w FROM MediaFileTag w WHERE w.mediaFile = ?1</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="OAuthAccessorRecord"
-            class="org.apache.roller.weblogger.pojos.OAuthAccessorRecord">
+            class="org.apache.roller.weblogger.pojos.OAuthAccessorRecord" access="PROPERTY">
         <table name="roller_oauthaccessor"/>
         <named-query name="OAuthAccessorRecord.getByKey">
             <query>SELECT p FROM OAuthAccessorRecord p WHERE p.consumerKey = ?1</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="OAuthConsumerRecord"
-            class="org.apache.roller.weblogger.pojos.OAuthConsumerRecord">
+            class="org.apache.roller.weblogger.pojos.OAuthConsumerRecord" access="PROPERTY">
         <table name="roller_oauthconsumer"/>
         <named-query name="OAuthConsumerRecord.getByConsumerKey">
             <query>SELECT p FROM OAuthConsumerRecord p WHERE p.consumerKey = ?1</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="ObjectPermission"
-            class="org.apache.roller.weblogger.pojos.ObjectPermission">
+            class="org.apache.roller.weblogger.pojos.ObjectPermission" access="PROPERTY">
         <table name="roller_permission"/>
         <inheritance />
         <discriminator-column name="objecttype" />

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="PingQueueEntry"
-            class="org.apache.roller.weblogger.pojos.PingQueueEntry">
+            class="org.apache.roller.weblogger.pojos.PingQueueEntry" access="PROPERTY">
         <table name="pingqueueentry"/>
         <named-query name="PingQueueEntry.getAllOrderByEntryTime">
             <query>SELECT p FROM PingQueueEntry p ORDER BY p.entryTime</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="PingTarget"
-            class="org.apache.roller.weblogger.pojos.PingTarget">
+            class="org.apache.roller.weblogger.pojos.PingTarget" access="PROPERTY">
         <table name="pingtarget"/>
         <named-query name="PingTarget.getByWebsiteNullOrderByName">
             <query>SELECT p FROM PingTarget p WHERE p.website IS NULL ORDER BY p.name</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="RuntimeConfigProperty"
-            class="org.apache.roller.weblogger.pojos.RuntimeConfigProperty">
+            class="org.apache.roller.weblogger.pojos.RuntimeConfigProperty" access="PROPERTY">
         <table name="roller_properties"/>
         <named-query name="RuntimeConfigProperty.getAll">
             <query>SELECT r FROM RuntimeConfigProperty r</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,17 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
-    
     <package>org.apache.roller.weblogger.pojos</package>
-    
-    <entity metadata-complete="true" name="TaskLock" class="org.apache.roller.weblogger.pojos.TaskLock">
+    <entity metadata-complete="true" name="TaskLock" class="org.apache.roller.weblogger.pojos.TaskLock"
+            access="PROPERTY">
         <table name="roller_tasklock"/>
         
         <named-query name="TaskLock.getByName">

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,14 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.weblogger.pojos</package>
-    <entity metadata-complete="true" name="User" class="org.apache.roller.weblogger.pojos.User">
+    <entity metadata-complete="true" name="User" class="org.apache.roller.weblogger.pojos.User"
+            access="PROPERTY">
         <table name="rolleruser"/>
         <named-query name="User.getAll">
             <query>SELECT u FROM User u</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,14 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.weblogger.pojos</package>
-    <entity metadata-complete="true" name="UserAttribute" class="org.apache.roller.weblogger.pojos.UserAttribute">
+    <entity metadata-complete="true" name="UserAttribute" class="org.apache.roller.weblogger.pojos.UserAttribute"
+            access="PROPERTY">
         <table name="roller_userattribute"/>
         
         <named-query name="UserAttribute.getByUserName">

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,14 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.weblogger.pojos</package>
-    <entity metadata-complete="true" name="UserRole" class="org.apache.roller.weblogger.pojos.UserRole">
+    <entity metadata-complete="true" name="UserRole" class="org.apache.roller.weblogger.pojos.UserRole"
+            access="PROPERTY">
         <table name="userrole"/>
         
         <named-query name="UserRole.getByUserName">

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,14 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-	<description>Persistence Metadata for Roller</description>
-	<persistence-unit-metadata>
-		<persistence-unit-defaults>
-			<access>PROPERTY</access>
-		</persistence-unit-defaults>
-	</persistence-unit-metadata>
 	<package>org.apache.roller.weblogger.pojos</package>
-	<entity metadata-complete="true" name="Weblog" class="org.apache.roller.weblogger.pojos.Weblog">
+	<entity metadata-complete="true" name="Weblog" class="org.apache.roller.weblogger.pojos.Weblog"
+            access="PROPERTY">
 		<table name="website"/>
 		<named-query name="Weblog.getByHandle">
 			<query>SELECT w FROM Weblog w WHERE w.handle = ?1</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="WeblogBookmark"
-            class="org.apache.roller.weblogger.pojos.WeblogBookmark">
+            class="org.apache.roller.weblogger.pojos.WeblogBookmark" access="PROPERTY">
         <table name="bookmark"/>
         <named-query name="BoomarkData.getByFolder">
             <query>SELECT b FROM WeblogBookmark b WHERE b.folder = ?1</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,14 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.weblogger.pojos</package>
-    <entity metadata-complete="true" name="WeblogBookmarkFolder" class="org.apache.roller.weblogger.pojos.WeblogBookmarkFolder">
+    <entity metadata-complete="true" name="WeblogBookmarkFolder" class="org.apache.roller.weblogger.pojos.WeblogBookmarkFolder"
+            access="PROPERTY">
         <table name="folder"/>
         <named-query name="WeblogBookmarkFolder.getByWebsite">
             <query>SELECT f FROM WeblogBookmarkFolder f WHERE f.website = ?1</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="WeblogCategory"
-            class="org.apache.roller.weblogger.pojos.WeblogCategory">
+            class="org.apache.roller.weblogger.pojos.WeblogCategory" access="PROPERTY">
         <table name="weblogcategory"/>
         <named-query name="WeblogCategory.getByPath&amp;Website">
                 <query>SELECT w FROM WeblogCategory w WHERE w.path = ?1 AND w.website = ?2</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="WeblogEntry"
-            class="org.apache.roller.weblogger.pojos.WeblogEntry">
+            class="org.apache.roller.weblogger.pojos.WeblogEntry" access="PROPERTY">
         <table name="weblogentry"/>
         <named-query name="WeblogEntry.getByStatus&amp;Category">
             <query>SELECT w FROM WeblogEntry w WHERE w.status = ?1 AND w.category = ?2</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="WeblogEntryAttribute"
-            class="org.apache.roller.weblogger.pojos.WeblogEntryAttribute">
+            class="org.apache.roller.weblogger.pojos.WeblogEntryAttribute" access="PROPERTY">
         <table name="entryattribute"/>
         <attributes>
             <id name="id">

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,14 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
-    <entity metadata-complete="true" name="WeblogEntryComment" class="org.apache.roller.weblogger.pojos.WeblogEntryComment">
+    <entity metadata-complete="true" name="WeblogEntryComment" class="org.apache.roller.weblogger.pojos.WeblogEntryComment"
+            access="PROPERTY">
         <table name="roller_comment"/>
         <named-query name="WeblogEntryComment.getCountAllDistinctByStatus">
             <!-- DISTINCT is not required for this query as comments would never be duplicated in retrieved result-->

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,9 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="WeblogEntryTag"
-            class="org.apache.roller.weblogger.pojos.WeblogEntryTag">
+            class="org.apache.roller.weblogger.pojos.WeblogEntryTag" access="PROPERTY">
         <table name="roller_weblogentrytag"/>
         <named-query name="WeblogEntryTag.getByWeblog">
             <query>SELECT w FROM WeblogEntryTag w WHERE w.weblog= ?1</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="WeblogEntryTagAggregate"
-            class="org.apache.roller.weblogger.pojos.WeblogEntryTagAggregate">
+            class="org.apache.roller.weblogger.pojos.WeblogEntryTagAggregate" access="PROPERTY">
         <table name="roller_weblogentrytagagg"/>
         <named-query name="WeblogEntryTagAggregate.getByName&amp;WebsiteOrderByLastUsedDesc">
             <query>SELECT w FROM WeblogEntryTagAggregate w WHERE w.name = ?1 AND w.weblog = ?2 ORDER BY w.lastUsed DESC</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,14 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
-    <entity metadata-complete="true" name="WeblogHitCount" class="org.apache.roller.weblogger.pojos.WeblogHitCount">
+    <entity metadata-complete="true" name="WeblogHitCount" class="org.apache.roller.weblogger.pojos.WeblogHitCount"
+            access="PROPERTY">
         <table name="roller_hitcounts"/>
         <named-query name="WeblogHitCount.getByWeblog">
             <query>SELECT h FROM WeblogHitCount h WHERE h.weblog = ?1</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults> 
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="WeblogPermission"
-            class="org.apache.roller.weblogger.pojos.WeblogPermission">
+            class="org.apache.roller.weblogger.pojos.WeblogPermission" access="PROPERTY">
         <discriminator-value>Weblog</discriminator-value>
         
         <named-query name="WeblogPermission.getAll">

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,14 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
-    <entity metadata-complete="true" name="WeblogReferrer" class="org.apache.roller.weblogger.pojos.WeblogReferrer">
+    <entity metadata-complete="true" name="WeblogReferrer" class="org.apache.roller.weblogger.pojos.WeblogReferrer"
+            access="PROPERTY">
         <table name="referer"/>
         <named-query name="WeblogReferrer.getByWeblogEntry&amp;TitleNotNull&amp;ExcerptNotNullOrderByTotalHitsDesc">
             <query>SELECT r FROM WeblogReferrer r WHERE r.weblogEntry = ?1 AND r.title IS NOT NULL AND r.excerpt IS NOT NULL ORDER BY r.totalHits DESC</query>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml?rev=1506595&r1=1506594&r2=1506595&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml Wed Jul 24 15:23:38 2013
@@ -2,15 +2,10 @@
 <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
-    <description>Persistence Metadata for Roller</description>
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <access>PROPERTY</access>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
+
     <package>org.apache.roller.weblogger.pojos</package>
     <entity metadata-complete="true" name="WeblogTemplate"
-            class="org.apache.roller.weblogger.pojos.WeblogTemplate">
+            class="org.apache.roller.weblogger.pojos.WeblogTemplate"  access="PROPERTY">
         <table name="webpage"/>
         <named-query name="WeblogTemplate.getByWebsite">
             <query>SELECT w FROM WeblogTemplate w WHERE w.website = ?1</query>

Added: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml?rev=1506595&view=auto
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml (added)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml Wed Jul 24 15:23:38 2013
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
+
+    <package>org.apache.roller.weblogger.pojos</package>
+    <entity metadata-complete="true" name="WeblogThemeAssoc"
+            class="org.apache.roller.weblogger.pojos.WeblogThemeAssoc" access="PROPERTY">
+        <table name="rol_weblogtheme"/>
+        <named-query name="WeblogThemeAssoc.getThemeAssocByType">
+            <query>SELECT a FROM WeblogThemeAssoc a WHERE a.weblog = ?1 AND a.type =?2</query>
+        </named-query>
+        <named-query name="WeblogThemeAssoc.getThemeAssocsByWeblog">
+            <query>SELECT a FROM WeblogThemeAssoc a WHERE a.weblog = ?1</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="name">
+                <column name="name" insertable="true" updatable="true" nullable="false"/>
+            </basic>
+            <basic name="custom">
+                <column name="custom" insertable="true" updatable="true" nullable="false"/>
+            </basic>
+            <basic name="type">
+                <column name="type" insertable="true" updatable="true" nullable="false"/>
+            </basic>
+            <many-to-one name="weblog" target-entity="org.apache.roller.weblogger.pojos.Weblog">
+                <join-column name="weblogid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml?rev=1506595&view=auto
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml (added)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml Wed Jul 24 15:23:38 2013
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
+
+    <package>org.apache.roller.weblogger.pojos</package>
+    <entity metadata-complete="true" name="WeblogThemeTemplateCode"
+            class="org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode" access="PROPERTY">
+        <table name="rol_templatecode"/>
+        <named-query name="WeblogThemeTemplateCode.getTemplateCodeByType">
+            <query>SELECT c FROM WeblogThemeTemplateCode c WHERE c.templateId = ?1 AND c.type =?2</query>
+        </named-query>
+        <named-query name="WeblogThemeTemplateCode.getTemplateCodesByTemplateId">
+            <query>SELECT c FROM WeblogThemeTemplateCode c WHERE c.templateId = ?1</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="template">
+                <column name="template" insertable="true" updatable="true" nullable="false"/>
+            </basic>
+            <basic name="templateId">
+                <column name="templateId" insertable="true" updatable="true" nullable="false"/>
+            </basic>
+            <basic name="type">
+                <column name="type" insertable="true" updatable="true" nullable="false"/>
+            </basic>
+            <basic name="templateLanguage">
+                <column name="templatelang" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="contentType">
+                <column name="contenttype" insertable="true" updatable="true" unique="false"/>
+            </basic>
+        </attributes>
+    </entity>
+</entity-mappings>



Mime
View raw message