Return-Path: 
 <commits-return-7623-apmail-roller-commits-archive=roller.apache.org@roller.apache.org>
X-Original-To: apmail-roller-commits-archive@www.apache.org
Delivered-To: apmail-roller-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DA7F8106FA
	for <apmail-roller-commits-archive@www.apache.org>;
 Tue, 30 Jul 2013 20:26:28 +0000 (UTC)
Received: (qmail 33892 invoked by uid 500); 30 Jul 2013 20:26:28 -0000
Delivered-To: apmail-roller-commits-archive@roller.apache.org
Received: (qmail 33860 invoked by uid 500); 30 Jul 2013 20:26:28 -0000
Mailing-List: contact commits-help@roller.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@roller.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@roller.apache.org>
List-Post: <mailto:commits@roller.apache.org>
List-Id: <commits.roller.apache.org>
Reply-To: dev@roller.apache.org
Delivered-To: mailing list commits@roller.apache.org
Received: (qmail 33853 invoked by uid 99); 30 Jul 2013 20:26:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jul 2013 20:26:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jul 2013 20:26:27 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0635E23888A6;
	Tue, 30 Jul 2013 20:26:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1508608 - in /roller/trunk/app: ./
 src/main/java/org/apache/roller/weblogger/pojos/
 src/main/java/org/apache/roller/weblogger/ui/struts2/editor/
 src/main/resources/ src/main/resources/org/apache/roller/weblogger/config/
Date: Tue, 30 Jul 2013 20:26:06 -0000
To: commits@roller.apache.org
From: gmazza@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130730202607.0635E23888A6@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gmazza
Date: Tue Jul 30 20:26:06 2013
New Revision: 1508608

URL: http://svn.apache.org/r1508608
Log:
Changes to MediaFileBase to allow it to work also with EclipseLink (change still works with Hibernate).  Remaining with Hibernate for a while to see any anything pops up with it.

Modified:
    roller/trunk/app/pom.xml
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
    roller/trunk/app/src/main/resources/ApplicationResources.properties
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties

Modified: roller/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1508608&r1=1508607&r2=1508608&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Tue Jul 30 20:26:06 2013
@@ -80,7 +80,6 @@
              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>

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java?rev=1508608&r1=1508607&r2=1508608&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java Tue Jul 30 20:26:06 2013
@@ -235,6 +235,15 @@ public class MediaFileDirectory {
         return newDirectory;
     }
 
+    /**
+     * Removes a directory from this MediaFileDirectory's child list
+     *
+     * @param mfd Media directory to remove
+     */
+    public void removeChildDirectory(MediaFileDirectory mfd) {
+        this.getChildDirectories().remove(mfd);
+    }
+
     @Override
     public boolean equals(Object other) {
         if (other == this) {

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java?rev=1508608&r1=1508607&r2=1508608&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java Tue Jul 30 20:26:06 2013
@@ -112,6 +112,7 @@ public class MediaFileBase extends UIAct
                 for (int index = 0; index < dirIds.length; index++) {
                     log.debug("Deleting media file directory - " + dirIds[index]);
                     MediaFileDirectory mediaFileDir = manager.getMediaFileDirectory(dirIds[index]);
+                    mediaFileDir.getParent().removeChildDirectory(mediaFileDir);
                     manager.removeMediaFileDirectory(mediaFileDir);
                 }
             }

Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1508608&r1=1508607&r2=1508608&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Tue Jul 30 20:26:06 2013
@@ -1139,7 +1139,7 @@ mediaFileSidebar.search=Search Uploaded 
 mediaFile.search.title=Search media files
 mediaFile.delete.confirm=Delete selected media files and/or directories?
 mediaFile.move.confirm=Move selected media files?
-mediaFile.directoryCreate.success=New directory succesfully created.
+mediaFile.directoryCreate.success=New directory successfully created.
 mediaFile.includeInGallery.success = Media file(s) successfully included in gallery.
 mediaFile.delete.success = Media file(s) successfully deleted.
 mediaFile.move.success = Media file(s) successfully moved.

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1508608&r1=1508607&r2=1508608&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties Tue Jul 30 20:26:06 2013
@@ -717,6 +717,9 @@ newuser.categories=General,Status,Music
 hibernate.transaction.factory_class=org.hibernate.transaction.JTATransactionFactory
 hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
 
+# EclipseLink JPA properties
+eclipselink.persistence-context.flush-mode=auto
+
 #-----------------------------------------------------------------------------
 # Experimental, deprecated and "undocumented" settings
 #-----------------------------------------------------------------------------