incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r448311 [4/25] - in /incubator/graffito/trunk: ./ api/ api/src/java/org/apache/portals/graffito/context/ api/src/java/org/apache/portals/graffito/exception/ api/src/java/org/apache/portals/graffito/services/core/ api/src/java/org/apache/por...
Date Wed, 20 Sep 2006 19:37:21 GMT
Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/PermissionAction.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/PermissionAction.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/PermissionAction.java (original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/PermissionAction.java Wed Sep 20 12:37:05 2006
@@ -1,226 +1,226 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.portals.graffito.portlets.browser.actions;
-
-import java.security.Permission;
-import java.security.Permissions;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.portals.graffito.exception.ContentManagementException;
-import org.apache.portals.graffito.model.core.CmsObject;
-import org.apache.portals.graffito.model.permission.CmsPermission;
-import org.apache.portals.graffito.portlets.browser.dto.PathDTO;
-import org.apache.portals.graffito.portlets.browser.dto.PermissionDTO;
-import org.apache.portals.graffito.portlets.browser.dto.PermissionsDTO;
-import org.apache.portals.graffito.portlets.browser.session.BrowserSession;
-import org.apache.portals.graffito.portlets.browser.session.SessionUtil;
-import org.apache.portals.graffito.portlets.page.action.PortletActionInfo;
-import org.apache.portals.graffito.portlets.page.manager.PortletPageManager;
-import org.apache.portals.graffito.portlets.util.ServiceUtil;
-import org.apache.portals.graffito.services.core.ContentModelService;
-import org.apache.portals.graffito.services.core.ContentPermissionService;
-import org.apache.portals.graffito.services.core.ContentServerService;
-import org.apache.portals.graffito.util.UriUtil;
-
-
-
-
-/**
- *  Portlet Action used to manage the Graffito Folders & documents
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class PermissionAction extends BrowserAction
-{
-
-    /**
-     * Retrieve all permission assigned to a cms object
-     * @param actionInfo
-     * @throws PortletException
-     */
-    public void retrieve(PortletActionInfo actionInfo) throws PortletException
-    {
-        try
-        {
-            RenderRequest request = (RenderRequest) actionInfo.getRequest();
-            RenderResponse response = (RenderResponse) actionInfo.getResponse();
-            PortletPageManager portletPageManager = actionInfo.getPortletPageManager();
-           
-            response.setContentType(BrowserActionConstants.HTML_CONTENT_TYPE);                     
-            ContentModelService modelService =  ServiceUtil.getModelService();
-            ContentServerService serverService =  ServiceUtil.getServerService();            
-            ContentPermissionService permissionService = ServiceUtil.getPermissionService();
-            
-            String uri = this.getUri(request);
-            String scopeServer = UriUtil.getServerScope(uri);                            
-            CmsObject cmsObject = modelService.getCmsObject(uri);
-            
-            // Init the path DTO
-            PathDTO pathDTO = new PathDTO();
-            pathDTO.setServer(serverService.getServer(scopeServer));
-            pathDTO.setCmsObject(cmsObject);
-                        
-            // Init the permissions DTP
-            Permissions permissions = permissionService.getPermissions(uri);            
-            PermissionsDTO permissionsDTO = new PermissionsDTO();
-            permissionsDTO.setPermissions(permissions);
-            
-            portletPageManager.addContextObject(request, BrowserActionConstants.VELOCITY_PATH_DTO, pathDTO);                       
-            portletPageManager.addContextObject(request, BrowserActionConstants.VELOCITY_PERMISSIONS_DTO, permissionsDTO);
-                    
-            
-        }
-        catch (Exception e)
-        {
-            throw new PortletException("Impossible to retrieve a folder ", e);
-        }
-        
-    }
-    
-    /**
-     * Create/instantiate a new empty permission
-     *  
-     * @param actionInfo The action info 
-     * @throws PortletException when it is not possible to create a new permission
-     */
-    public void create(PortletActionInfo actionInfo) throws PortletException
-    {
-        try
-        {
-
-            RenderRequest request = (RenderRequest) actionInfo.getRequest();
-            RenderResponse response = (RenderResponse) actionInfo.getResponse();
-            PortletPageManager portletPageManager = actionInfo.getPortletPageManager();          
-            response.setContentType(BrowserActionConstants.HTML_CONTENT_TYPE);           
-
-            ContentModelService modelService =  ServiceUtil.getModelService();
-            ContentServerService serverService =  ServiceUtil.getServerService();            
-            ContentPermissionService permissionService = ServiceUtil.getPermissionService();
-            
-            String uri = this.getUri(request);
-            CmsObject cmsObject = modelService.getCmsObject(uri);
-            String scopeServer = UriUtil.getServerScope(uri);
-            
-            // Init the path DTO
-            PathDTO pathDTO = new PathDTO();
-            pathDTO.setServer(serverService.getServer(scopeServer));
-            pathDTO.setCmsObject(cmsObject);
-            
-            // Init the permission DTO
-            CmsPermission cmsPermission = permissionService.createPermission(uri, CmsPermission.ALL);
-            PermissionDTO permissionDTO =  new PermissionDTO();
-            permissionDTO.setPermission((Permission) cmsPermission);
-            SessionUtil.setOperation(request, BrowserSession.INSERT);
-            
-            portletPageManager.addContextObject(request, BrowserActionConstants.VELOCITY_PATH_DTO, pathDTO);            
-            portletPageManager.addContextObject(request, BrowserActionConstants.VELOCITY_PERMISSION_DTO, permissionDTO);
-            
-        }
-        catch (ContentManagementException e)
-        {
-            throw new PortletException("Impossible to create a folder ", e);
-        }
-    }   
-        
-    
-    /**
-     * Save (insert or update a new permission) 
-     * @param actionInfo The action info 
-     * @throws PortletException when it is not possible to save the permission
-     */
-    public void save(PortletActionInfo actionInfo) throws PortletException
-    {
-        try
-        {
-            ActionRequest request = (ActionRequest) actionInfo.getRequest();           
-            PortletPageManager portletPageManager = actionInfo.getPortletPageManager();
-            
-            String permissionName =  request.getParameter("permissionName");            
-            String[] actionValues = request.getParameterValues("actions");
-            String actions = "";
-            for (int i=0; i<actionValues.length; i++)
-            {
-                if (i>0)
-                {
-                    actions += ",";
-                }
-                actions = actions + actionValues[i];
-            }
-            
-            String attributes = request.getParameter("attributes");
-            String principal = request.getParameter("principal");
-            
-            ContentPermissionService permissionService = ServiceUtil.getPermissionService();
-            BrowserSession browserSession = SessionUtil.getBrowserSession(request);
-            if (browserSession.isInsert())
-            {
-                if (attributes != null && ! attributes.equals(""))
-                {
-                    permissionName = permissionName + "/" + attributes;
-                }
-                CmsPermission permission =  permissionService.createPermission(permissionName, actions );
-                permissionService.addPermission((Permission) permission);
-                
-                permissionService.grantPermission(principal, permission);                
-            }
-            portletPageManager.setSelectedEditPageId(request, "folderEdit");
-            SessionUtil.setOperation(request, null);
-
-            
-        }
-        catch (Exception e)
-        {
-            throw new PortletException("Impossible to insert a permission ", e);
-        }
-    }
-
-    /**
-     * Delete a permission
-     *  
-     * @param actionInfo The action info 
-     * @throws PortletException when it is not possible to create a new permission
-     */
-    public void delete(PortletActionInfo actionInfo) throws PortletException
-    {
-        try
-        {
-            ActionRequest request = (ActionRequest) actionInfo.getRequest();
-            PortletPageManager portletPageManager = actionInfo.getPortletPageManager();
-            // The http request contains an array of permissions to delete
-            // each string in this array is structured as 'permissionName_permissionAction'
-            String[] permissionToDelete = request.getParameterValues("selectedPermissions");
-            ContentPermissionService permissionService = ServiceUtil.getPermissionService();
-                        
-            for (int i = 0; i<permissionToDelete.length; i++)
-            {                 
-                String[] permissionDescription = permissionToDelete[i].split("_"); 
-                CmsPermission cmsPermission = permissionService.createPermission(permissionDescription[0], permissionDescription[1]);               
-                permissionService.removePermission((Permission) cmsPermission);                
-            }
-            
-            portletPageManager.setSelectedEditPageId(request, "folderEdit");
-        }
-        catch (Exception e)
-        {
-            throw new PortletException("Impossible to delete a permission", e);
-        }
-    }
-
-}
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.portals.graffito.portlets.browser.actions;
+
+import java.security.Permission;
+import java.security.Permissions;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.portals.graffito.exception.ContentManagementException;
+import org.apache.portals.graffito.model.core.CmsObject;
+import org.apache.portals.graffito.model.permission.CmsPermission;
+import org.apache.portals.graffito.portlets.browser.dto.PathDTO;
+import org.apache.portals.graffito.portlets.browser.dto.PermissionDTO;
+import org.apache.portals.graffito.portlets.browser.dto.PermissionsDTO;
+import org.apache.portals.graffito.portlets.browser.session.BrowserSession;
+import org.apache.portals.graffito.portlets.browser.session.SessionUtil;
+import org.apache.portals.graffito.portlets.page.action.PortletActionInfo;
+import org.apache.portals.graffito.portlets.page.manager.PortletPageManager;
+import org.apache.portals.graffito.portlets.util.ServiceUtil;
+import org.apache.portals.graffito.services.core.ContentModelService;
+import org.apache.portals.graffito.services.core.ContentPermissionService;
+import org.apache.portals.graffito.services.core.ContentServerService;
+import org.apache.portals.graffito.util.UriUtil;
+
+
+
+
+/**
+ *  Portlet Action used to manage the Graffito Folders & documents
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class PermissionAction extends BrowserAction
+{
+
+    /**
+     * Retrieve all permission assigned to a cms object
+     * @param actionInfo
+     * @throws PortletException
+     */
+    public void retrieve(PortletActionInfo actionInfo) throws PortletException
+    {
+        try
+        {
+            RenderRequest request = (RenderRequest) actionInfo.getRequest();
+            RenderResponse response = (RenderResponse) actionInfo.getResponse();
+            PortletPageManager portletPageManager = actionInfo.getPortletPageManager();
+           
+            response.setContentType(BrowserActionConstants.HTML_CONTENT_TYPE);                     
+            ContentModelService modelService =  ServiceUtil.getModelService();
+            ContentServerService serverService =  ServiceUtil.getServerService();            
+            ContentPermissionService permissionService = ServiceUtil.getPermissionService();
+            
+            String uri = this.getUri(request);
+            String scopeServer = UriUtil.getServerScope(uri);                            
+            CmsObject cmsObject = modelService.getCmsObject(uri);
+            
+            // Init the path DTO
+            PathDTO pathDTO = new PathDTO();
+            pathDTO.setServer(serverService.getServer(scopeServer));
+            pathDTO.setCmsObject(cmsObject);
+                        
+            // Init the permissions DTP
+            Permissions permissions = permissionService.getPermissions(uri);            
+            PermissionsDTO permissionsDTO = new PermissionsDTO();
+            permissionsDTO.setPermissions(permissions);
+            
+            portletPageManager.addContextObject(request, BrowserActionConstants.VELOCITY_PATH_DTO, pathDTO);                       
+            portletPageManager.addContextObject(request, BrowserActionConstants.VELOCITY_PERMISSIONS_DTO, permissionsDTO);
+                    
+            
+        }
+        catch (Exception e)
+        {
+            throw new PortletException("Impossible to retrieve a folder ", e);
+        }
+        
+    }
+    
+    /**
+     * Create/instantiate a new empty permission
+     *  
+     * @param actionInfo The action info 
+     * @throws PortletException when it is not possible to create a new permission
+     */
+    public void create(PortletActionInfo actionInfo) throws PortletException
+    {
+        try
+        {
+
+            RenderRequest request = (RenderRequest) actionInfo.getRequest();
+            RenderResponse response = (RenderResponse) actionInfo.getResponse();
+            PortletPageManager portletPageManager = actionInfo.getPortletPageManager();          
+            response.setContentType(BrowserActionConstants.HTML_CONTENT_TYPE);           
+
+            ContentModelService modelService =  ServiceUtil.getModelService();
+            ContentServerService serverService =  ServiceUtil.getServerService();            
+            ContentPermissionService permissionService = ServiceUtil.getPermissionService();
+            
+            String uri = this.getUri(request);
+            CmsObject cmsObject = modelService.getCmsObject(uri);
+            String scopeServer = UriUtil.getServerScope(uri);
+            
+            // Init the path DTO
+            PathDTO pathDTO = new PathDTO();
+            pathDTO.setServer(serverService.getServer(scopeServer));
+            pathDTO.setCmsObject(cmsObject);
+            
+            // Init the permission DTO
+            CmsPermission cmsPermission = permissionService.createPermission(uri, CmsPermission.ALL);
+            PermissionDTO permissionDTO =  new PermissionDTO();
+            permissionDTO.setPermission((Permission) cmsPermission);
+            SessionUtil.setOperation(request, BrowserSession.INSERT);
+            
+            portletPageManager.addContextObject(request, BrowserActionConstants.VELOCITY_PATH_DTO, pathDTO);            
+            portletPageManager.addContextObject(request, BrowserActionConstants.VELOCITY_PERMISSION_DTO, permissionDTO);
+            
+        }
+        catch (ContentManagementException e)
+        {
+            throw new PortletException("Impossible to create a folder ", e);
+        }
+    }   
+        
+    
+    /**
+     * Save (insert or update a new permission) 
+     * @param actionInfo The action info 
+     * @throws PortletException when it is not possible to save the permission
+     */
+    public void save(PortletActionInfo actionInfo) throws PortletException
+    {
+        try
+        {
+            ActionRequest request = (ActionRequest) actionInfo.getRequest();           
+            PortletPageManager portletPageManager = actionInfo.getPortletPageManager();
+            
+            String permissionName =  request.getParameter("permissionName");            
+            String[] actionValues = request.getParameterValues("actions");
+            String actions = "";
+            for (int i=0; i<actionValues.length; i++)
+            {
+                if (i>0)
+                {
+                    actions += ",";
+                }
+                actions = actions + actionValues[i];
+            }
+            
+            String attributes = request.getParameter("attributes");
+            String principal = request.getParameter("principal");
+            
+            ContentPermissionService permissionService = ServiceUtil.getPermissionService();
+            BrowserSession browserSession = SessionUtil.getBrowserSession(request);
+            if (browserSession.isInsert())
+            {
+                if (attributes != null && ! attributes.equals(""))
+                {
+                    permissionName = permissionName + "/" + attributes;
+                }
+                CmsPermission permission =  permissionService.createPermission(permissionName, actions );
+                permissionService.addPermission((Permission) permission);
+                
+                permissionService.grantPermission(principal, permission);                
+            }
+            portletPageManager.setSelectedEditPageId(request, "folderEdit");
+            SessionUtil.setOperation(request, null);
+
+            
+        }
+        catch (Exception e)
+        {
+            throw new PortletException("Impossible to insert a permission ", e);
+        }
+    }
+
+    /**
+     * Delete a permission
+     *  
+     * @param actionInfo The action info 
+     * @throws PortletException when it is not possible to create a new permission
+     */
+    public void delete(PortletActionInfo actionInfo) throws PortletException
+    {
+        try
+        {
+            ActionRequest request = (ActionRequest) actionInfo.getRequest();
+            PortletPageManager portletPageManager = actionInfo.getPortletPageManager();
+            // The http request contains an array of permissions to delete
+            // each string in this array is structured as 'permissionName_permissionAction'
+            String[] permissionToDelete = request.getParameterValues("selectedPermissions");
+            ContentPermissionService permissionService = ServiceUtil.getPermissionService();
+                        
+            for (int i = 0; i<permissionToDelete.length; i++)
+            {                 
+                String[] permissionDescription = permissionToDelete[i].split("_"); 
+                CmsPermission cmsPermission = permissionService.createPermission(permissionDescription[0], permissionDescription[1]);               
+                permissionService.removePermission((Permission) cmsPermission);                
+            }
+            
+            portletPageManager.setSelectedEditPageId(request, "folderEdit");
+        }
+        catch (Exception e)
+        {
+            throw new PortletException("Impossible to delete a permission", e);
+        }
+    }
+
+}

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/PermissionAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/DocumentDTO.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/DocumentDTO.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/DocumentDTO.java (original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/DocumentDTO.java Wed Sep 20 12:37:05 2006
@@ -1,89 +1,89 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
- * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.apache.portals.graffito.portlets.browser.dto;
-
-import java.util.ArrayList;
-
-import org.apache.portals.graffito.model.core.Content;
-import org.apache.portals.graffito.model.dm.Document;
-
-/**
- * Main information on the current document object displayed in the Graffito Browser Portlet.
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class DocumentDTO
-{   
-    private String parentUri;
-    
-    /** Current folder display in the Browser portlet, can be null if it is a server root folder */    
-    private Document document;
-        
-    private ArrayList documentTypes;
-    
-    private ArrayList documentLanguages;
-      
-    
-    /**
-     * Get the uri associated to the cms object display in the Browser
-     * @return The uri
-     */
-    public String getParentUri()
-    {
-        return parentUri;
-    }
-            
-    
-    public Content getDocument()
-    {
-        return document;
-    }
-    
-    public void setDocument(Document document)
-    {
-        this.document = document;
-    }
-    
-    public ArrayList getDocumentLanguages()
-    {
-        return documentLanguages;
-    }
-    public void setDocumentLanguages(ArrayList documentLanguages)
-    {
-        this.documentLanguages = documentLanguages;
-    }
-    public ArrayList getDocumentTypes()
-    {
-        return documentTypes;
-    }
-    public void setDocumentTypes(ArrayList documentTypes)
-    {
-        this.documentTypes = documentTypes;
-    }
-    
-    public boolean isHTML()
-    {
-        return (((Document)document).getContentType().equals("text/html"));
-    }
-
-    public boolean isText()
-    {
-        return (((Document)document).getContentType().equals("text/plain"));
-    }
-                    
-    public boolean isBinary()
-    {
-        return ((! this.isHTML()) && (! this.isText()) );
-    }    
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.portals.graffito.portlets.browser.dto;
+
+import java.util.ArrayList;
+
+import org.apache.portals.graffito.model.core.Content;
+import org.apache.portals.graffito.model.dm.Document;
+
+/**
+ * Main information on the current document object displayed in the Graffito Browser Portlet.
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class DocumentDTO
+{   
+    private String parentUri;
+    
+    /** Current folder display in the Browser portlet, can be null if it is a server root folder */    
+    private Document document;
+        
+    private ArrayList documentTypes;
+    
+    private ArrayList documentLanguages;
+      
+    
+    /**
+     * Get the uri associated to the cms object display in the Browser
+     * @return The uri
+     */
+    public String getParentUri()
+    {
+        return parentUri;
+    }
+            
+    
+    public Content getDocument()
+    {
+        return document;
+    }
+    
+    public void setDocument(Document document)
+    {
+        this.document = document;
+    }
+    
+    public ArrayList getDocumentLanguages()
+    {
+        return documentLanguages;
+    }
+    public void setDocumentLanguages(ArrayList documentLanguages)
+    {
+        this.documentLanguages = documentLanguages;
+    }
+    public ArrayList getDocumentTypes()
+    {
+        return documentTypes;
+    }
+    public void setDocumentTypes(ArrayList documentTypes)
+    {
+        this.documentTypes = documentTypes;
+    }
+    
+    public boolean isHTML()
+    {
+        return (((Document)document).getContentType().equals("text/html"));
+    }
+
+    public boolean isText()
+    {
+        return (((Document)document).getContentType().equals("text/plain"));
+    }
+                    
+    public boolean isBinary()
+    {
+        return ((! this.isHTML()) && (! this.isText()) );
+    }    
 }

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/DocumentDTO.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/FolderDTO.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/FolderDTO.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/FolderDTO.java (original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/FolderDTO.java Wed Sep 20 12:37:05 2006
@@ -1,122 +1,122 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
- * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.apache.portals.graffito.portlets.browser.dto;
-
-import java.util.Collection;
-
-import org.apache.portals.graffito.model.core.Folder;
-
-/**
- * Main information on the current folder object displayed in the Graffito Browser Portlet.
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class FolderDTO
-{   
-    /** The uri assigned to the parent folder */
-    private String parentUri;
-    
-    /** Current folder display in the Browser portlet, can be null if it is a server root folder */    
-    private Folder folder;
-    
-    /** Document children found in the current folder */ 
-    private Collection contents;
-
-    /** Folder children found in the current folder */
-    private Collection folders;
-    
-   
-    
-    /**
-     * Get the uri associated to the parent folder
-     * @return The uri
-     */
-    public String getParentUri()
-    {
-        return parentUri;
-    }
-    
-    
-    public void setParentUri(String parentUri)
-    {
-        this.parentUri = parentUri;
-    }
-    
-    
-    /**
-     * @return Returns the document children.
-     */
-    public Collection getContents()
-    {
-        return contents;
-    }
-
-    /**
-     * @param documents The document children to set.
-     */
-    public void setContents(Collection documents)
-    {
-        this.contents = documents;
-    }
-
-    /**
-     * @return Returns the folders children.
-     */
-    public Collection getFolders()
-    {
-        return folders;
-    }
-
-    /**
-     * @param folders The folders to set.
-     */
-    public void setFolders(Collection folders)
-    {
-        this.folders = folders;
-    }
-
-    /**
-     * @return the current folder
-     */
-    public Folder getFolder()
-    {
-        return folder;
-    }
-    
-    /**
-     * @param folder The current folder to set
-     */
-    public void setFolder(Folder folder)
-    {
-        this.folder = folder;
-    }
-    
-        
-    /**
-     * @return true if the Browser is empty, else false
-     */
-    public boolean isEmpty()
-    {
-        if ((((contents == null) || (contents.size() == 0))) &&
-            (((folders == null) || (folders.size() == 0)))) 
-        {
-            return true;
-        }
-        else 
-        {
-            return false;
-        }
-    }
-        
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.portals.graffito.portlets.browser.dto;
+
+import java.util.Collection;
+
+import org.apache.portals.graffito.model.core.Folder;
+
+/**
+ * Main information on the current folder object displayed in the Graffito Browser Portlet.
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class FolderDTO
+{   
+    /** The uri assigned to the parent folder */
+    private String parentUri;
+    
+    /** Current folder display in the Browser portlet, can be null if it is a server root folder */    
+    private Folder folder;
+    
+    /** Document children found in the current folder */ 
+    private Collection contents;
+
+    /** Folder children found in the current folder */
+    private Collection folders;
+    
+   
+    
+    /**
+     * Get the uri associated to the parent folder
+     * @return The uri
+     */
+    public String getParentUri()
+    {
+        return parentUri;
+    }
+    
+    
+    public void setParentUri(String parentUri)
+    {
+        this.parentUri = parentUri;
+    }
+    
+    
+    /**
+     * @return Returns the document children.
+     */
+    public Collection getContents()
+    {
+        return contents;
+    }
+
+    /**
+     * @param documents The document children to set.
+     */
+    public void setContents(Collection documents)
+    {
+        this.contents = documents;
+    }
+
+    /**
+     * @return Returns the folders children.
+     */
+    public Collection getFolders()
+    {
+        return folders;
+    }
+
+    /**
+     * @param folders The folders to set.
+     */
+    public void setFolders(Collection folders)
+    {
+        this.folders = folders;
+    }
+
+    /**
+     * @return the current folder
+     */
+    public Folder getFolder()
+    {
+        return folder;
+    }
+    
+    /**
+     * @param folder The current folder to set
+     */
+    public void setFolder(Folder folder)
+    {
+        this.folder = folder;
+    }
+    
+        
+    /**
+     * @return true if the Browser is empty, else false
+     */
+    public boolean isEmpty()
+    {
+        if ((((contents == null) || (contents.size() == 0))) &&
+            (((folders == null) || (folders.size() == 0)))) 
+        {
+            return true;
+        }
+        else 
+        {
+            return false;
+        }
+    }
+        
 }

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/FolderDTO.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PathDTO.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PathDTO.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PathDTO.java (original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PathDTO.java Wed Sep 20 12:37:05 2006
@@ -1,103 +1,103 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
- * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.apache.portals.graffito.portlets.browser.dto;
-
-import java.util.ArrayList;
-
-import org.apache.portals.graffito.model.core.CmsObject;
-import org.apache.portals.graffito.model.core.Folder;
-import org.apache.portals.graffito.model.server.Server;
-
-/**
- * This DTO is used to displat the path from the root folder to a selected cms object.
- * 
- * @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class PathDTO
-{   
-        
-    /** Current cms object*/    
-    private CmsObject cmsObject ;
-    
-    /** Server object associated to the current folder */
-    private Server server;
-    
-    
-    /**
-     * Get the selected cms object
-     * @return the cms object
-     */
-    public CmsObject getCmsObject()
-    {
-        return cmsObject;
-    }
-    
-    /**
-     * Set the selected cms object
-     * @param cmsObject to set
-     */
-    public void setCmsObject(CmsObject cmsObject)
-    {
-        this.cmsObject = cmsObject;
-    }
-    /**
-     * @return the current server
-     */
-    public Server getServer()
-    {
-        return server;
-    }
-        
-    /**
-     * 
-     * @param server The current server to set
-     */
-    public void setServer(Server server)
-    {
-        this.server = server;
-    }
-    
-    
-    /**
-     * return an array list containing all folders between the root and the selected cms object
-     * 
-     * @return an array of cms object
-     */
-    public ArrayList getPath()
-    {
-        ArrayList cmsPath = new ArrayList();
-        
-        Folder folder = cmsObject.getParentFolder();
-        if (folder != null)
-        {
-            cmsPath.add(folder);
-            Folder parentFolder = folder.getParentFolder();
-            while (parentFolder != null)
-            {
-                cmsPath.add(0, parentFolder);
-                parentFolder = parentFolder.getParentFolder();
-            }
-        }
-        
-        // cmsObject.getName() can be null when creating a new cms object
-        if (cmsObject instanceof Folder && cmsObject.getName() != null)
-        {
-            cmsPath.add(cmsObject);
-        }
-                
-        return cmsPath;
-        
-    }
-                
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.portals.graffito.portlets.browser.dto;
+
+import java.util.ArrayList;
+
+import org.apache.portals.graffito.model.core.CmsObject;
+import org.apache.portals.graffito.model.core.Folder;
+import org.apache.portals.graffito.model.server.Server;
+
+/**
+ * This DTO is used to displat the path from the root folder to a selected cms object.
+ * 
+ * @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class PathDTO
+{   
+        
+    /** Current cms object*/    
+    private CmsObject cmsObject ;
+    
+    /** Server object associated to the current folder */
+    private Server server;
+    
+    
+    /**
+     * Get the selected cms object
+     * @return the cms object
+     */
+    public CmsObject getCmsObject()
+    {
+        return cmsObject;
+    }
+    
+    /**
+     * Set the selected cms object
+     * @param cmsObject to set
+     */
+    public void setCmsObject(CmsObject cmsObject)
+    {
+        this.cmsObject = cmsObject;
+    }
+    /**
+     * @return the current server
+     */
+    public Server getServer()
+    {
+        return server;
+    }
+        
+    /**
+     * 
+     * @param server The current server to set
+     */
+    public void setServer(Server server)
+    {
+        this.server = server;
+    }
+    
+    
+    /**
+     * return an array list containing all folders between the root and the selected cms object
+     * 
+     * @return an array of cms object
+     */
+    public ArrayList getPath()
+    {
+        ArrayList cmsPath = new ArrayList();
+        
+        Folder folder = cmsObject.getParentFolder();
+        if (folder != null)
+        {
+            cmsPath.add(folder);
+            Folder parentFolder = folder.getParentFolder();
+            while (parentFolder != null)
+            {
+                cmsPath.add(0, parentFolder);
+                parentFolder = parentFolder.getParentFolder();
+            }
+        }
+        
+        // cmsObject.getName() can be null when creating a new cms object
+        if (cmsObject instanceof Folder && cmsObject.getName() != null)
+        {
+            cmsPath.add(cmsObject);
+        }
+                
+        return cmsPath;
+        
+    }
+                
 }

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PathDTO.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PermissionDTO.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PermissionDTO.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PermissionDTO.java (original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PermissionDTO.java Wed Sep 20 12:37:05 2006
@@ -1,42 +1,42 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
- * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.apache.portals.graffito.portlets.browser.dto;
-
-import java.security.Permission;
-
-
-/**
- * Information on one permission.
- * This is the DTO used between the velocity template and the portlet methods
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class PermissionDTO
-{   
-    /** Permission assigned to the cms object */
-    private Permission permission;
-    
-    
-    
-    public Permission getPermission()
-    {
-        return permission;
-    }
-    
-    public void setPermission(Permission permission)
-    {
-        this.permission = permission;
-    }
-                
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.portals.graffito.portlets.browser.dto;
+
+import java.security.Permission;
+
+
+/**
+ * Information on one permission.
+ * This is the DTO used between the velocity template and the portlet methods
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class PermissionDTO
+{   
+    /** Permission assigned to the cms object */
+    private Permission permission;
+    
+    
+    
+    public Permission getPermission()
+    {
+        return permission;
+    }
+    
+    public void setPermission(Permission permission)
+    {
+        this.permission = permission;
+    }
+                
 }

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PermissionDTO.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PermissionsDTO.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PermissionsDTO.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PermissionsDTO.java (original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PermissionsDTO.java Wed Sep 20 12:37:05 2006
@@ -1,43 +1,43 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
- * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.apache.portals.graffito.portlets.browser.dto;
-
-import java.security.Permissions;
-
-
-/**
- * Information on the current cms object permissions.
- * This is the DTO used between the velocity template and the portlet methods
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class PermissionsDTO
-{   
-    /** Permissions assigned to the cms object */
-    private Permissions permissions;
-    
-   
-    
-    public Permissions getPermissions()
-    {
-        return permissions;
-    }
-    
-    public void setPermissions(Permissions permissions)
-    {
-        this.permissions = permissions;
-    }
-    
-            
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.portals.graffito.portlets.browser.dto;
+
+import java.security.Permissions;
+
+
+/**
+ * Information on the current cms object permissions.
+ * This is the DTO used between the velocity template and the portlet methods
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class PermissionsDTO
+{   
+    /** Permissions assigned to the cms object */
+    private Permissions permissions;
+    
+   
+    
+    public Permissions getPermissions()
+    {
+        return permissions;
+    }
+    
+    public void setPermissions(Permissions permissions)
+    {
+        this.permissions = permissions;
+    }
+    
+            
 }

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/dto/PermissionsDTO.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/resources/messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/resources/messages_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/resources/messages_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/resources/messages_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/session/BrowserSession.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/session/BrowserSession.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/session/BrowserSession.java (original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/session/BrowserSession.java Wed Sep 20 12:37:05 2006
@@ -1,93 +1,93 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.portals.graffito.portlets.browser.session;
-
-/**
- * This class contains information about the browser stored in the user session. 
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class BrowserSession
-{
-   
-    /** the uri of the displayed cms object */
-    private String uri;
-    
-    /** Store information used on different wizard step ( eg. create a new document) */
-    private Object wizardInfo;
-       
-    /** Operation made on the displayed cms object (insert, update, delete) */
-    private String operation;
-            
-    /** Insert operation */
-    public static final String INSERT = "insert";
-    
-    /** Update operation */
-    public static final String UPDATE = "update";
-    
-    /** Delete operation */
-    public static final String DELETE = "delete";
-    
-           
-    public String getUri()
-    {
-        return uri;
-    }
-    public void setUri(String uri)
-    {
-        this.uri = uri;
-    }
-    
-       
-    public Object getWizardInfo()
-    {
-        return wizardInfo;
-    }
-    public void setWizardInfo(Object wizardInfo)
-    {
-        this.wizardInfo = wizardInfo;
-    }
-    public String getOperation()
-    {
-        return operation;
-    }
-    
-    public void setOperation(String operation)
-    {
-        this.operation = operation;
-    }
-    
-    
-    public boolean isUpdate()
-    {
-        if (this.operation == null)
-        {
-            return false ;
-        }        
-        return this.operation.equals(UPDATE);
-    }
-    
-    public boolean isInsert()
-    {
-        
-        if (this.operation == null)
-        {
-            return false ;
-        }
-        return this.operation.equals(INSERT);
-    }    
-}
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.portals.graffito.portlets.browser.session;
+
+/**
+ * This class contains information about the browser stored in the user session. 
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class BrowserSession
+{
+   
+    /** the uri of the displayed cms object */
+    private String uri;
+    
+    /** Store information used on different wizard step ( eg. create a new document) */
+    private Object wizardInfo;
+       
+    /** Operation made on the displayed cms object (insert, update, delete) */
+    private String operation;
+            
+    /** Insert operation */
+    public static final String INSERT = "insert";
+    
+    /** Update operation */
+    public static final String UPDATE = "update";
+    
+    /** Delete operation */
+    public static final String DELETE = "delete";
+    
+           
+    public String getUri()
+    {
+        return uri;
+    }
+    public void setUri(String uri)
+    {
+        this.uri = uri;
+    }
+    
+       
+    public Object getWizardInfo()
+    {
+        return wizardInfo;
+    }
+    public void setWizardInfo(Object wizardInfo)
+    {
+        this.wizardInfo = wizardInfo;
+    }
+    public String getOperation()
+    {
+        return operation;
+    }
+    
+    public void setOperation(String operation)
+    {
+        this.operation = operation;
+    }
+    
+    
+    public boolean isUpdate()
+    {
+        if (this.operation == null)
+        {
+            return false ;
+        }        
+        return this.operation.equals(UPDATE);
+    }
+    
+    public boolean isInsert()
+    {
+        
+        if (this.operation == null)
+        {
+            return false ;
+        }
+        return this.operation.equals(INSERT);
+    }    
+}

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/session/BrowserSession.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/session/SessionUtil.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/session/SessionUtil.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/session/SessionUtil.java (original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/session/SessionUtil.java Wed Sep 20 12:37:05 2006
@@ -1,126 +1,126 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.portals.graffito.portlets.browser.session;
-
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-
-
-/**
- * This class manages the {@link org.apache.portals.graffito.portlets.browser.session.BrowserSession} per portlet session
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class SessionUtil
-{
-     /** The browser object session name */
-     public static final String BROWSER_SESSION = "browserSession";
-     
-     /**
-      * Add in the user session a new Browser session object
-      * @param request the portlet request
-      * @param browserSession the browser session object to set
-      */
-     public static void setBrowserSession(PortletRequest request, BrowserSession browserSession)
-     {
-         request.getPortletSession().setAttribute(BROWSER_SESSION, browserSession);
-     }
-     
-     /**
-      * Get the current Browser session object found in the portlet request
-      * @param request the portlet request
-      * @return the browser session object
-      */
-     public static BrowserSession getBrowserSession(PortletRequest request)
-     {
-          
-         return (BrowserSession) request.getPortletSession().getAttribute(BROWSER_SESSION, PortletSession.PORTLET_SCOPE);
-     }
-     
-     public static String getUri(PortletRequest request)
-     {
-         BrowserSession browserSession = getBrowserSession(request);
-         if (browserSession == null)
-         {
-             return null;
-         }
-         
-         return browserSession.getUri();
-     }
-     
-     public static void setUri(PortletRequest request, String uri)
-     {
-         BrowserSession browserSession = getBrowserSession(request);
-         if (browserSession == null)
-         {
-             browserSession = new BrowserSession();
-         }
-         
-         browserSession.setUri(uri);
-         setBrowserSession(request, browserSession);
-     }
-
-     
-     public static Object getWizardInfo(PortletRequest request)
-     {
-         BrowserSession browserSession = getBrowserSession(request);
-         if (browserSession == null)
-         {
-             return null;
-         }
-         
-         return browserSession.getWizardInfo();
-     }
-     
-     public static void setWizardInfo(PortletRequest request, Object wizardInfo)
-     {
-         BrowserSession browserSession = getBrowserSession(request);
-         if (browserSession == null)
-         {
-             browserSession = new BrowserSession();
-         }
-         
-         browserSession.setWizardInfo(wizardInfo);
-         setBrowserSession(request, browserSession);
-     }
-     
-     
-     public static String getOperation(PortletRequest request)
-     {
-         BrowserSession browserSession = getBrowserSession(request);
-         if (browserSession == null)
-         {
-             return null;
-         }
-         
-         return browserSession.getOperation();
-     }
-     
-     public static void setOperation(PortletRequest request, String operation)
-     {
-         BrowserSession browserSession = getBrowserSession(request);
-         if (browserSession == null)
-         {
-             browserSession = new BrowserSession();
-         }
-         
-         browserSession.setOperation(operation);
-         setBrowserSession(request, browserSession);
-     }
-     
-
-}
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.portals.graffito.portlets.browser.session;
+
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSession;
+
+
+/**
+ * This class manages the {@link org.apache.portals.graffito.portlets.browser.session.BrowserSession} per portlet session
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class SessionUtil
+{
+     /** The browser object session name */
+     public static final String BROWSER_SESSION = "browserSession";
+     
+     /**
+      * Add in the user session a new Browser session object
+      * @param request the portlet request
+      * @param browserSession the browser session object to set
+      */
+     public static void setBrowserSession(PortletRequest request, BrowserSession browserSession)
+     {
+         request.getPortletSession().setAttribute(BROWSER_SESSION, browserSession);
+     }
+     
+     /**
+      * Get the current Browser session object found in the portlet request
+      * @param request the portlet request
+      * @return the browser session object
+      */
+     public static BrowserSession getBrowserSession(PortletRequest request)
+     {
+          
+         return (BrowserSession) request.getPortletSession().getAttribute(BROWSER_SESSION, PortletSession.PORTLET_SCOPE);
+     }
+     
+     public static String getUri(PortletRequest request)
+     {
+         BrowserSession browserSession = getBrowserSession(request);
+         if (browserSession == null)
+         {
+             return null;
+         }
+         
+         return browserSession.getUri();
+     }
+     
+     public static void setUri(PortletRequest request, String uri)
+     {
+         BrowserSession browserSession = getBrowserSession(request);
+         if (browserSession == null)
+         {
+             browserSession = new BrowserSession();
+         }
+         
+         browserSession.setUri(uri);
+         setBrowserSession(request, browserSession);
+     }
+
+     
+     public static Object getWizardInfo(PortletRequest request)
+     {
+         BrowserSession browserSession = getBrowserSession(request);
+         if (browserSession == null)
+         {
+             return null;
+         }
+         
+         return browserSession.getWizardInfo();
+     }
+     
+     public static void setWizardInfo(PortletRequest request, Object wizardInfo)
+     {
+         BrowserSession browserSession = getBrowserSession(request);
+         if (browserSession == null)
+         {
+             browserSession = new BrowserSession();
+         }
+         
+         browserSession.setWizardInfo(wizardInfo);
+         setBrowserSession(request, browserSession);
+     }
+     
+     
+     public static String getOperation(PortletRequest request)
+     {
+         BrowserSession browserSession = getBrowserSession(request);
+         if (browserSession == null)
+         {
+             return null;
+         }
+         
+         return browserSession.getOperation();
+     }
+     
+     public static void setOperation(PortletRequest request, String operation)
+     {
+         BrowserSession browserSession = getBrowserSession(request);
+         if (browserSession == null)
+         {
+             browserSession = new BrowserSession();
+         }
+         
+         browserSession.setOperation(operation);
+         setBrowserSession(request, browserSession);
+     }
+     
+
+}

Propchange: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/session/SessionUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/jetspeed-portlet.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/jetspeed-portlet.xml?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/jetspeed-portlet.xml (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/jetspeed-portlet.xml Wed Sep 20 12:37:05 2006
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<portlet-app id="graffito-test" version="1.0" 
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
-    xmlns:js="http://portals.apache.org/jetspeed" 
-    xmlns:dc="http://www.purl.org/dc">
-    
-    <portlet>
-        <portlet-name>graffitoBrowser</portlet-name>
-        <dc:title>Graffito Browser Portlet</dc:title>
-        <dc:creator>Graffito Team</dc:creator>
-    </portlet>	
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<portlet-app id="graffito-test" version="1.0" 
+    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
+    xmlns:js="http://portals.apache.org/jetspeed" 
+    xmlns:dc="http://www.purl.org/dc">
+    
+    <portlet>
+        <portlet-name>graffitoBrowser</portlet-name>
+        <dc:title>Graffito Browser Portlet</dc:title>
+        <dc:creator>Graffito Team</dc:creator>
+    </portlet>	
 </portlet-app>

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/jetspeed-portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/pages.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/pages.xml?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/pages.xml (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/pages.xml Wed Sep 20 12:37:05 2006
@@ -1,65 +1,65 @@
-<pages>
-	<actions>
-		<action id="cmsobject" class="org.apache.portals.graffito.portlets.browser.actions.CmsObjectAction" />
-		<action id="folder" class="org.apache.portals.graffito.portlets.browser.actions.FolderAction" />
-		<action id="document" class="org.apache.portals.graffito.portlets.browser.actions.DocumentAction" />
-		<action id="permission" class="org.apache.portals.graffito.portlets.browser.actions.PermissionAction" />
-		<action id="forward" class="org.apache.portals.graffito.portlets.browser.actions.ForwardAction" forward = "true" />
-	</actions>
-	
-	<view>
-		<page id = "folderViewer" action="folder.retrieve" template="/WEB-INF/view/folder/folder-browser.vm" defaultPage="true" />
-		<page id = "documentHtmlTextViewer" action="document.retrieve" 
-			template="/WEB-INF/view/document/document-view-text-html.vm">
-			<editpage portletPageId="documentEdit" />
-		</page>
-		<page id = "documentUploadViewer" action="document.retrieve" template="/WEB-INF/view/document/document-view-upload.vm">
-			<editpage portletPageId="documentEdit" />
-		</page>
-	</view>
-	
-	<edit>
-		<page id = "folderEdit" template="/WEB-INF/view/folder/folder-tab.vm" defaultPage="true" action="folder.retrieve">
-			<tab id="folder-edit">
-				<page id="metadata" label="tab.folder-edit.metadata" template="/WEB-INF/view/folder/folder-metadata.vm"  defaultTabPage="true" />				
-				<page id="children" label="tab.folder-edit.children" template="/WEB-INF/view/folder/folder-children.vm" action = "folder.retrieveChildren"  />
-				<page id="security" label="tab.security" template="/WEB-INF/view/security/security-browser.vm" action="permission.retrieve" />
-			</tab>
-		</page>
-		
-		<page id = "folderCreate" action="folder.create" template="/WEB-INF/view/folder/folder-metadata.vm" >
-			<viewpage portletPageId="folderViewer" />
-		</page>
-		
-		<page id = "documentEdit" template="/WEB-INF/view/document/document-tab.vm" action="document.retrieve" >
-			<tab id="document-edit">
-				<page id="metadata" label="tab.document-edit.metadata" template= "/WEB-INF/view/document/document-edit-metadata.vm" defaultTabPage="true" />								
-				<page id="content-text" label="tab.document-edit.content" template="/WEB-INF/view/document/document-edit-text.vm" condition="documentDTO.isText()" />
-				<page id="content-html" label="tab.document-edit.content" template="/kupu/kupu.vm" 	condition="documentDTO.isHTML()" />
-				<page id="content-upload" label="tab.document-edit.content" template="/WEB-INF/view/document/document-edit-upload.vm" condition="documentDTO.isBinary()" />										
-				<page id="security" label="tab.security" template= "/WEB-INF/view/security/security-browser.vm"  />
-			</tab>
-			
-			<!-- Order is important for the view page reference  :
-			     the engine will the select the first viewpage which has a condition returning true -->			
-			<viewpage condition=" (! documentDTO.isBinary())" portletPageId="documentHtmlTextViewer" />
-			<viewpage portletPageId="documentUploadViewer" />
-		</page>
-		
-		<page id = "documentCreate" action="document.createWizard" template="/WEB-INF/view/document/document-edit-metadata.vm" />
-		
-	    <page id = "textEdit" action="document.createWizard" template="/WEB-INF/view/document/document-edit-text.vm" >
-			<viewpage portletPageId="documentHtmlTextViewer" />
-		</page>
-		
-		<page id = "htmlEdit" action="document.createWizard" template="/kupu/kupu.vm" >
-			<viewpage portletPageId="documentHtmlTextViewer" />
-		</page>
-		
-		<page id = "uploadEdit" action="document.createWizard" template="/WEB-INF/view/document/document-edit-upload.vm" >
-			<viewpage portletPageId="documentUploadViewer" />
-		</page>
-		
-		<page id = "permissionCreate" action="permission.create" template="/WEB-INF/view/security/security-permission.vm" />
-	</edit>
+<pages>
+	<actions>
+		<action id="cmsobject" class="org.apache.portals.graffito.portlets.browser.actions.CmsObjectAction" />
+		<action id="folder" class="org.apache.portals.graffito.portlets.browser.actions.FolderAction" />
+		<action id="document" class="org.apache.portals.graffito.portlets.browser.actions.DocumentAction" />
+		<action id="permission" class="org.apache.portals.graffito.portlets.browser.actions.PermissionAction" />
+		<action id="forward" class="org.apache.portals.graffito.portlets.browser.actions.ForwardAction" forward = "true" />
+	</actions>
+	
+	<view>
+		<page id = "folderViewer" action="folder.retrieve" template="/WEB-INF/view/folder/folder-browser.vm" defaultPage="true" />
+		<page id = "documentHtmlTextViewer" action="document.retrieve" 
+			template="/WEB-INF/view/document/document-view-text-html.vm">
+			<editpage portletPageId="documentEdit" />
+		</page>
+		<page id = "documentUploadViewer" action="document.retrieve" template="/WEB-INF/view/document/document-view-upload.vm">
+			<editpage portletPageId="documentEdit" />
+		</page>
+	</view>
+	
+	<edit>
+		<page id = "folderEdit" template="/WEB-INF/view/folder/folder-tab.vm" defaultPage="true" action="folder.retrieve">
+			<tab id="folder-edit">
+				<page id="metadata" label="tab.folder-edit.metadata" template="/WEB-INF/view/folder/folder-metadata.vm"  defaultTabPage="true" />				
+				<page id="children" label="tab.folder-edit.children" template="/WEB-INF/view/folder/folder-children.vm" action = "folder.retrieveChildren"  />
+				<page id="security" label="tab.security" template="/WEB-INF/view/security/security-browser.vm" action="permission.retrieve" />
+			</tab>
+		</page>
+		
+		<page id = "folderCreate" action="folder.create" template="/WEB-INF/view/folder/folder-metadata.vm" >
+			<viewpage portletPageId="folderViewer" />
+		</page>
+		
+		<page id = "documentEdit" template="/WEB-INF/view/document/document-tab.vm" action="document.retrieve" >
+			<tab id="document-edit">
+				<page id="metadata" label="tab.document-edit.metadata" template= "/WEB-INF/view/document/document-edit-metadata.vm" defaultTabPage="true" />								
+				<page id="content-text" label="tab.document-edit.content" template="/WEB-INF/view/document/document-edit-text.vm" condition="documentDTO.isText()" />
+				<page id="content-html" label="tab.document-edit.content" template="/kupu/kupu.vm" 	condition="documentDTO.isHTML()" />
+				<page id="content-upload" label="tab.document-edit.content" template="/WEB-INF/view/document/document-edit-upload.vm" condition="documentDTO.isBinary()" />										
+				<page id="security" label="tab.security" template= "/WEB-INF/view/security/security-browser.vm"  />
+			</tab>
+			
+			<!-- Order is important for the view page reference  :
+			     the engine will the select the first viewpage which has a condition returning true -->			
+			<viewpage condition=" (! documentDTO.isBinary())" portletPageId="documentHtmlTextViewer" />
+			<viewpage portletPageId="documentUploadViewer" />
+		</page>
+		
+		<page id = "documentCreate" action="document.createWizard" template="/WEB-INF/view/document/document-edit-metadata.vm" />
+		
+	    <page id = "textEdit" action="document.createWizard" template="/WEB-INF/view/document/document-edit-text.vm" >
+			<viewpage portletPageId="documentHtmlTextViewer" />
+		</page>
+		
+		<page id = "htmlEdit" action="document.createWizard" template="/kupu/kupu.vm" >
+			<viewpage portletPageId="documentHtmlTextViewer" />
+		</page>
+		
+		<page id = "uploadEdit" action="document.createWizard" template="/WEB-INF/view/document/document-edit-upload.vm" >
+			<viewpage portletPageId="documentUploadViewer" />
+		</page>
+		
+		<page id = "permissionCreate" action="permission.create" template="/WEB-INF/view/security/security-permission.vm" />
+	</edit>
 </pages>

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/pages.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/toolbox.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/velocity.properties
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/velocity.properties?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/velocity.properties (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/velocity.properties Wed Sep 20 12:37:05 2006
@@ -1,116 +1,116 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#----------------------------------------------------------------------------
-# These are the default properties for the
-# Velocity Runtime. These values are used when
-# Runtime.init() is called, and when Runtime.init(properties)
-# fails to find the specificed properties file.
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-# R U N T I M E  L O G  
-#----------------------------------------------------------------------------
-# This is the location of the Velocity Runtime log.
-#----------------------------------------------------------------------------
-
-runtime.log = velocity.log
-
-#----------------------------------------------------------------------------
-# T E M P L A T E  E N C O D I N G
-#----------------------------------------------------------------------------
-
-template.encoding=8859_1
-
-#----------------------------------------------------------------------------
-# C O N T E N T  T Y P E  
-#----------------------------------------------------------------------------
-# This is the default content type for the VelocityServlet.
-#----------------------------------------------------------------------------
-
-default.contentType=text/html
-
-#----------------------------------------------------------------------------
-# F O R E A C H  P R O P E R T I E S
-#----------------------------------------------------------------------------
-# These properties control how the counter is accessed in the #foreach
-# directive. By default the reference $velocityCount will be available
-# in the body of the #foreach directive. The default starting value
-# for this reference is 1.
-#----------------------------------------------------------------------------
-
-counter.name = velocityCount
-counter.initial.value = 1
-
-#----------------------------------------------------------------------------
-# I N C L U D E  P R O P E R T I E S
-#----------------------------------------------------------------------------
-# These are the properties that governed the way #include'd content
-# is governed.
-#----------------------------------------------------------------------------
-
-include.path=.
-include.cache = false
-include.output.errormsg.start = <!-- include error : 
-include.output.errormsg.end   =  see error log -->
-
-#----------------------------------------------------------------------------
-# P A R S E  P R O P E R T I E S
-#----------------------------------------------------------------------------
-
-parse_directive.maxdepth = 10
-
-#----------------------------------------------------------------------------
-# T E M P L A T E  L O A D E R S
-#----------------------------------------------------------------------------
-# 
-# 
-#----------------------------------------------------------------------------
-
-template.loader.1.public.name = File
-template.loader.1.description = Velocity File Template Loader
-template.loader.1.class = org.apache.velocity.runtime.loader.FileTemplateLoader
-template.loader.1.template.path = .
-template.loader.1.cache = false
-template.loader.1.modificationCheckInterval = 2
-
-velocimacro.library.autoreload = true
-velocimacro.permissions.allow.inline.to.replace.global = true
-velocimacro.library = /WEB-INF/VM_global_library.vm, /WEB-INF/velocity/velocity-macros.vm, /WEB-INF/velocity/graffito-macros.vm
-
-#template.loader.2.public.name = URL
-#template.loader.2.description = Velocity URL Template Loader
-#template.loader.2.class = org.apache.velocity.runtime.loader.URLTemplateLoader
-#template.loader.2.template.path = http://localhost/templates/
-#template.loader.2.cache = false
-
-#----------------------------------------------------------------------------
-# E X T E R N A L  S E R V I C E  I N I T I A L I Z A T I O N
-#----------------------------------------------------------------------------
-# If this property is set to true then an external service will
-# set certain system properties and initialize the Velocity
-# Runtime. This method is used by Turbine to initialize the
-# Velocity Runtime for the TurbineVelocityService.
-#----------------------------------------------------------------------------
-
-external.init = false
-
-#----------------------------------------------------------------------------
-# C H A R A C T E R  E N C O D I N G
-#----------------------------------------------------------------------------
-# Character encoding for input (templates). Using this, you can use
-# alternative encoding for your templates, such as UTF-8.
-#----------------------------------------------------------------------------
-input.encoding = UTF-8
-
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#----------------------------------------------------------------------------
+# These are the default properties for the
+# Velocity Runtime. These values are used when
+# Runtime.init() is called, and when Runtime.init(properties)
+# fails to find the specificed properties file.
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+# R U N T I M E  L O G  
+#----------------------------------------------------------------------------
+# This is the location of the Velocity Runtime log.
+#----------------------------------------------------------------------------
+
+runtime.log = velocity.log
+
+#----------------------------------------------------------------------------
+# T E M P L A T E  E N C O D I N G
+#----------------------------------------------------------------------------
+
+template.encoding=8859_1
+
+#----------------------------------------------------------------------------
+# C O N T E N T  T Y P E  
+#----------------------------------------------------------------------------
+# This is the default content type for the VelocityServlet.
+#----------------------------------------------------------------------------
+
+default.contentType=text/html
+
+#----------------------------------------------------------------------------
+# F O R E A C H  P R O P E R T I E S
+#----------------------------------------------------------------------------
+# These properties control how the counter is accessed in the #foreach
+# directive. By default the reference $velocityCount will be available
+# in the body of the #foreach directive. The default starting value
+# for this reference is 1.
+#----------------------------------------------------------------------------
+
+counter.name = velocityCount
+counter.initial.value = 1
+
+#----------------------------------------------------------------------------
+# I N C L U D E  P R O P E R T I E S
+#----------------------------------------------------------------------------
+# These are the properties that governed the way #include'd content
+# is governed.
+#----------------------------------------------------------------------------
+
+include.path=.
+include.cache = false
+include.output.errormsg.start = <!-- include error : 
+include.output.errormsg.end   =  see error log -->
+
+#----------------------------------------------------------------------------
+# P A R S E  P R O P E R T I E S
+#----------------------------------------------------------------------------
+
+parse_directive.maxdepth = 10
+
+#----------------------------------------------------------------------------
+# T E M P L A T E  L O A D E R S
+#----------------------------------------------------------------------------
+# 
+# 
+#----------------------------------------------------------------------------
+
+template.loader.1.public.name = File
+template.loader.1.description = Velocity File Template Loader
+template.loader.1.class = org.apache.velocity.runtime.loader.FileTemplateLoader
+template.loader.1.template.path = .
+template.loader.1.cache = false
+template.loader.1.modificationCheckInterval = 2
+
+velocimacro.library.autoreload = true
+velocimacro.permissions.allow.inline.to.replace.global = true
+velocimacro.library = /WEB-INF/VM_global_library.vm, /WEB-INF/velocity/velocity-macros.vm, /WEB-INF/velocity/graffito-macros.vm
+
+#template.loader.2.public.name = URL
+#template.loader.2.description = Velocity URL Template Loader
+#template.loader.2.class = org.apache.velocity.runtime.loader.URLTemplateLoader
+#template.loader.2.template.path = http://localhost/templates/
+#template.loader.2.cache = false
+
+#----------------------------------------------------------------------------
+# E X T E R N A L  S E R V I C E  I N I T I A L I Z A T I O N
+#----------------------------------------------------------------------------
+# If this property is set to true then an external service will
+# set certain system properties and initialize the Velocity
+# Runtime. This method is used by Turbine to initialize the
+# Velocity Runtime for the TurbineVelocityService.
+#----------------------------------------------------------------------------
+
+external.init = false
+
+#----------------------------------------------------------------------------
+# C H A R A C T E R  E N C O D I N G
+#----------------------------------------------------------------------------
+# Character encoding for input (templates). Using this, you can use
+# alternative encoding for your templates, such as UTF-8.
+#----------------------------------------------------------------------------
+input.encoding = UTF-8
+

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/velocity.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message