roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1037348 - in /roller/trunk: ./ planet-business/ planet-business/src/main/resources/META-INF/ planet-business/src/main/resources/org/apache/roller/planet/pojos/ weblogger-business/ weblogger-business/src/main/java/org/apache/roller/weblogge...
Date Sat, 20 Nov 2010 22:45:40 GMT
Author: snoopdave
Date: Sat Nov 20 22:45:39 2010
New Revision: 1037348

URL: http://svn.apache.org/viewvc?rev=1037348&view=rev
Log:
Fixes to allow Roller's JUnit tests to run against Hibernate JPA 2.0
https://issues.apache.org/jira/browse/ROL-1892

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

Modified: roller/trunk/planet-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Sat Nov 20 22:45:39 2010
@@ -1,3 +1,4 @@
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -33,21 +34,35 @@
             <version>${roller.version}</version>
         </dependency>
 
-<!--
+        <!-- OpenJPA deps -->
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-pool</groupId>
+                    <artifactId>commons-pool</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+<!-- EclipseLink deps (for sometimes testing purposes)
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
             <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
             <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_2.0_spec</artifactId>
@@ -56,20 +71,18 @@
         </dependency
 -->
 
+<!-- Hibernate deps (for sometimes testing purposes)
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-pool</groupId>
-                    <artifactId>commons-pool</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>3.5.1-Final</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.5.6</version>
+            <scope>runtime</scope>
+        </dependency> -->
 
         <dependency>
             <groupId>javax.mail</groupId>
@@ -182,10 +195,10 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
 
-                    <!-- Just in case OpenJPA bytecode enhancement is turned off -->
+                    <!-- Just in case OpenJPA bytecode enhancement is turned off
                     <forkMode>once</forkMode>
                     <argLine>-javaagent:${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.0/openjpa-2.0.0.jar</argLine>
-
+                    -->
                     <systemProperties>
                         <property>
                             <name>catalina.base</name>
@@ -283,7 +296,8 @@
                                 <startdb databaseDir="${project.build.directory}/derby-system"
                                          port="3221"
                                          databaseScriptsDir="${project.build.directory}/dbscripts"
-                                         skip="${maven.test.skip}" ></startdb>
+                                         skip="${maven.test.skip}" >
+                                </startdb>
                             </tasks>
                         </configuration>
                     </execution>
@@ -302,7 +316,8 @@
                                 <stopdb databaseDir="${project.build.directory}/derby-system"
                                         port="3221"
                                         databaseScriptsDir="${project.build.directory}/dbscripts"
-                                        skip="${maven.test.skip}" ></stopdb>
+                                        skip="${maven.test.skip}" >
+                                </stopdb>
                                 <delete dir="${project.build.directory}/derby-system" verbose="true" failonerror="false" />
                             </tasks>
                         </configuration>
@@ -377,7 +392,7 @@
             </build>
         </profile>
 
-    </profiles>
+    </profiles> 
 
 </project>
 

Modified: roller/trunk/planet-business/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/resources/META-INF/persistence.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/resources/META-INF/persistence.xml (original)
+++ roller/trunk/planet-business/src/main/resources/META-INF/persistence.xml Sat Nov 20 22:45:39 2010
@@ -1,4 +1,4 @@
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
     
     <persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">
         <!--

Modified: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml (original)
+++ roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml (original)
+++ roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>
@@ -55,6 +55,7 @@
                           target-entity="org.apache.roller.planet.pojos.Subscription"
                           mapped-by="groups"/>
             <transient name="categoryRestrictionAsArray"/>
+            <transient name="recentEntries"/>
         </attributes>
     </entity>
 </entity-mappings>

Modified: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml (original)
+++ roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml (original)
+++ roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>
@@ -68,7 +68,7 @@
                 </join-table>
             </many-to-many>
             <transient name="name"/>
-            <transient name="uRL"/>
+            <transient name="URL"/>
         </attributes>
     </entity>
 </entity-mappings>

Modified: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml (original)
+++ roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sat Nov 20 22:45:39 2010
@@ -1,3 +1,4 @@
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -108,15 +109,20 @@
             <url>http://oss.sonatype.org/content/groups/public</url>
         </repository>
 
-        <!--
+        <!-- EclipseLink repo
         <repository>
             <id>EclipseLink Repo</id>
             <url>http://www.eclipse.org/downloads/download.php?r=1&amp;nf=1&amp;file=/rt/eclipselink/maven.repo</url>
              <snapshots>
                 <enabled>true</enabled>
              </snapshots>
-        </repository>
-        -->
+        </repository> -->
+        
+        <!-- JBoss Hibernate JPA repo
+        <repository>
+            <id>JBoss Repo</id>
+            <url>http://repository.jboss.com/maven2</url>
+        </repository>  -->
 
         <!-- for jstl-1.2 for now.. -->
         <repository>

Modified: roller/trunk/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Sat Nov 20 22:45:39 2010
@@ -42,48 +42,56 @@
             <version>5.0.0-RC2</version>
         </dependency>
 
-<!--
+        <!-- OpenJPA deps -->
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-pool</groupId>
+                    <artifactId>commons-pool</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+<!-- EclipseLink deps (for sometimes testing purposes)
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
             <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
             <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <version>1.1</version>
             <scope>provided</scope>
-        </dependency>
+        </dependency
 -->
 
+<!-- Hibernate deps (for sometimes testing purposes)
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-pool</groupId>
-                    <artifactId>commons-pool</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency> 
-
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>3.5.1-Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.5.6</version>
+            <scope>runtime</scope>
+        </dependency> -->
+        
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
@@ -220,10 +228,10 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
 
-                    <!-- Just in case OpenJPA bytecode enhancement is turned off -->
+                    <!-- Just in case OpenJPA bytecode enhancement is turned off
                     <forkMode>once</forkMode>
                     <argLine>-javaagent:${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.0/openjpa-2.0.0.jar</argLine>
-
+                     -->
                     <systemProperties>
                         <property>
                             <name>catalina.base</name>

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java Sat Nov 20 22:45:39 2010
@@ -72,13 +72,13 @@ public abstract class ObjectPermission e
         this.userName = username;
     }
 
-    public String getObjectType() {
+    /*public String getObjectType() {
         return objectType;
     }
 
     public void setObjectType(String objectType) {
         this.objectType = objectType;
-    }
+    }*/
 
     public String getObjectId() {
         return objectId;

Modified: roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml Sat Nov 20 22:45:39 2010
@@ -1,4 +1,4 @@
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
     
     <persistence-unit name ="RollerPU" transaction-type = "RESOURCE_LOCAL">
         <!--

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>
@@ -66,7 +66,14 @@
                     <cascade-all />
                 </cascade>
             </one-to-many>
+            <transient name="thumbnailURL"/>
+            <transient name="permalink"/>
+            <transient name="lastModified"/>
+            <transient name="path"/>
+            <transient name="creator"/>
+            <transient name="imageFile"/>
             <transient name="inputStream"/>
+            <transient name="thumbnailInputStream"/>
             <transient name="thumbnailHeight"/>
             <transient name="thumbnailWidth"/>
         </attributes>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>
@@ -54,6 +54,7 @@
                     <cascade-remove/>
                 </cascade>
             </one-to-many>
+            <transient name="empty"/>
         </attributes>
     </entity>
 </entity-mappings>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.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_1_0.xsd">
+<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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>
@@ -21,9 +21,9 @@
             <basic name="objectId">
                 <column name="objectid"/>
             </basic>
-            <basic name="objectType">
+            <!-- <basic name="objectType">
                 <column name="objecttype"/>
-            </basic>
+            </basic> -->
             <basic name="userName">
                 <column name="username"/>
             </basic>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.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_1_0.xsd">
+<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>
@@ -49,6 +49,8 @@
                 <column name="client" insertable="true" updatable="true" unique="false"/>
             </basic>
             
+            <transient name="leaseExpiration"/>
+                        
         </attributes>
     </entity>
 </entity-mappings>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>
@@ -204,6 +204,9 @@
 				<join-column name="defaultcatid" insertable="true" updatable="true"/>
 			</many-to-one>
 
+			<transient name="theme"/>
+			<transient name="creator"/>
+			<transient name="defaultPage"/>
 			<transient name="absoluteURL"/>
 			<transient name="adminUserCount"/>
 			<transient name="commentCount"/>
@@ -211,6 +214,7 @@
 			<transient name="todaysHits"/>
 			<transient name="todaysReferrers"/>
 			<transient name="uRL"/>
+			<transient name="URL"/>
 			<transient name="userCount"/>
 			<transient name="entryCount"/>
             <transient name="initializedPlugins"/>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

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=1037348&r1=1037347&r2=1037348&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 Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>
@@ -153,6 +153,7 @@
                     <cascade-remove />
                 </cascade>
             </one-to-many>
+            <transient name="creator"/>
             <transient name="categories"/>
             <transient name="commentCount"/>
             <transient name="commentsLink"/>
@@ -167,8 +168,7 @@
             <transient name="rss09xDescription"/>
             <transient name="tagsAsString"/>
             <transient name="transformedText"/>
-            <transient name="transformedSummary"/>
-            
+            <transient name="transformedSummary"/>         
             <transient name="comments"/>
             <transient name="pluginsList"/>
             <transient name="referers"/>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>
@@ -34,6 +34,7 @@
             <many-to-one name="weblogEntry" target-entity="org.apache.roller.weblogger.pojos.WeblogEntry">
                 <join-column name="entryid" insertable="true" updatable="true"/>
             </many-to-one>
+            <transient name="user" />
         </attributes>
     </entity>
 </entity-mappings>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>
@@ -32,7 +32,6 @@
         <named-query name="WeblogPermission.getByUserName&amp;WeblogId&amp;NotPending">
             <query>SELECT p FROM WeblogPermission p WHERE p.userName = ?1 AND p.objectId = ?2 AND p.pending &lt;&gt; true</query>
         </named-query>
-
         
         <named-query name="WeblogPermission.getByUserName&amp;Pending">
             <query>SELECT p FROM WeblogPermission p WHERE p.userName = ?1 AND p.pending = TRUE</query>
@@ -42,5 +41,9 @@
             <query>SELECT p FROM WeblogPermission p WHERE p.objectId = ?1 AND p.pending = true</query>
         </named-query>
         
+        <attributes>
+            <transient name="user"/>
+            <transient name="weblog"/>
+        </attributes>
     </entity>
 </entity-mappings>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>

Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml Sat Nov 20 22:45:39 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+<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_1_0.xsd">
+    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>
@@ -69,8 +69,9 @@
             <many-to-one name="website" target-entity="org.apache.roller.weblogger.pojos.Weblog">
                 <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
             </many-to-one>
-            <transient name="required"/>
             
+            <transient name="custom"/>
+            <transient name="required"/>
             <transient name="decorator"/>
         </attributes>
     </entity>

Modified: roller/trunk/weblogger-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/pom.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Sat Nov 20 22:45:39 2010
@@ -1,3 +1,4 @@
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -51,47 +52,55 @@
             <version>5.0.0-RC2</version>
         </dependency>
 
-<!--
+        <!-- OpenJPA deps -->
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-pool</groupId>
+                    <artifactId>commons-pool</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+<!-- EclipseLink deps (for sometimes testing purposes)
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
             <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
             <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <version>1.1</version>
             <scope>provided</scope>
-        </dependency>
+        </dependency
 -->
 
+<!-- Hibernate deps (for sometimes testing purposes)
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-pool</groupId>
-                    <artifactId>commons-pool</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                	<artifactId>geronimo-jms_1.1_spec</artifactId>
-                	<groupId>org.apache.geronimo.specs</groupId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>3.5.1-Final</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.5.6</version>
+            <scope>runtime</scope>
+        </dependency> -->
 
         <dependency>
             <groupId>org.apache.struts</groupId>
@@ -422,10 +431,10 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
 
-                    <!-- Just in case OpenJPA bytecode enhancement is turned off -->
+                    <!-- Just in case OpenJPA bytecode enhancement is turned off
                     <forkMode>once</forkMode>
                     <argLine>-javaagent:${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.0/openjpa-2.0.0.jar</argLine>
-
+                    -->
                     <systemProperties>
                         <property>
                             <name>catalina.base</name>

Modified: roller/trunk/weblogger-web/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java (original)
+++ roller/trunk/weblogger-web/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java Sat Nov 20 22:45:39 2010
@@ -51,7 +51,7 @@ public class CommentValidatorTest extend
         //TestUtils.endSession(true);
 
         weblog = TestUtils.setupWeblog("doeblog", user);
-        //TestUtils.endSession(true);
+        //TestUtils.endSession(true)
         
         entry = TestUtils.setupWeblogEntry("anchor1", weblog.getDefaultCategory(), weblog, user);
 
@@ -60,13 +60,13 @@ public class CommentValidatorTest extend
     
     protected void tearDown() throws Exception {
         TestUtils.teardownWeblogEntry(entry.getId());
-        TestUtils.teardownWeblogCategory(weblog.getDefaultCategory().getId());
+        //TestUtils.teardownWeblogCategory(weblog.getDefaultCategory().getId());
         TestUtils.teardownWeblog(weblog.getId());
         TestUtils.teardownUser(user.getUserName());
     }
     
     public void testExcessSizeCommentValidator() {
-        /* RollerMessages msgs = new RollerMessages();
+        RollerMessages msgs = new RollerMessages();
         WeblogEntryComment comment = createEmptyComment();
 
         // string that exceeds default excess size threshold of 1000
@@ -79,10 +79,10 @@ public class CommentValidatorTest extend
         assertEquals(100, mgr.validateComment(comment, msgs));
 
         comment.setContent(sb.toString()); 
-        assertTrue(mgr.validateComment(comment, msgs) != 100); */
+        assertTrue(mgr.validateComment(comment, msgs) != 100);
     }
     
-    /* public void testExcessLinksCommentValidator() {
+    public void testExcessLinksCommentValidator() {
         RollerMessages msgs = new RollerMessages();
         WeblogEntryComment comment = createEmptyComment();
         
@@ -109,7 +109,7 @@ public class CommentValidatorTest extend
 
         comment.setContent("blah blah 01-suonerie.com blah"); 
         assertTrue(mgr.validateComment(comment, msgs) != 100);
-    }*/
+    }
     
 // To run this test add the Akismet validator to comment.validator.classnames
 // and put your Akismet key in comment.validator.akismet.apikey

Modified: roller/trunk/weblogger-webapp/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/pom.xml?rev=1037348&r1=1037347&r2=1037348&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/pom.xml (original)
+++ roller/trunk/weblogger-webapp/pom.xml Sat Nov 20 22:45:39 2010
@@ -461,10 +461,11 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
 
-                    <!-- Just in case OpenJPA bytecode enhancement is turned off -->
+                    <!-- Just in case OpenJPA bytecode enhancement is turned off 
                     <forkMode>once</forkMode>
                     <argLine>-javaagent:${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.0/openjpa-2.0.0.jar</argLine>
-
+                    -->
+                    
                     <systemProperties>
                         <property>
                             <name>catalina.base</name>



Mime
View raw message