roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
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 GMT
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
 #-----------------------------------------------------------------------------



Mime
View raw message