r1540 - in xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins: assets framework

[Jeremi Joslin]

Author: jeremi
Date: 2006-11-13 22:24:32 +0100 (Mon, 13 Nov 2006)
New Revision: 1540

Modified:
   xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java
   xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/framework/FrameworkManagerPlugin.java
Log:
[GELC]
* clear commented code
* update the rights of the asset if it's not a temporary one

Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java	2006-11-13 20:50:45 UTC (rev 1539)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java	2006-11-13 21:24:32 UTC (rev 1540)
@@ -260,6 +260,8 @@
             for(int i = 0; i < classList.length; i++)
                 asset.updateObjectFromRequest(classList[i]);
         asset.save();
+        if (!asset.getSpace().equals(ASSET_TEMPORARY_SPACE))
+            protectPublishedAsset(asset, context);
         return asset.getFullName();
     }
 

Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/framework/FrameworkManagerPlugin.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/framework/FrameworkManagerPlugin.java	2006-11-13 20:50:45 UTC (rev 1539)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/framework/FrameworkManagerPlugin.java	2006-11-13 21:24:32 UTC (rev 1540)
@@ -79,12 +79,6 @@
 
     public boolean importFramework(String frameworkName, InputStream iStream, XWikiContext context) throws XWikiException {
 
-
-/*        if (!iStream.markSupported()){
-            throw new PluginException(getName(), ERROR_FRAMEWORK_INPUTSTREAM_MARK_NOT_IMPLEMENTED, "");
-        }
-        iStream.mark(Integer.MAX_VALUE);   */
-
         Framework frameworkDoc = getFilter(context).readFramework(frameworkName, iStream, context);
 
         Collection items = getFilter(context).readFrameworkItems(frameworkDoc, iStream, context);