Author: knguyen
Date: Tue May 22 12:35:05 2007
New Revision: 17340

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17340&repname=
=3Djahia
Log:
SIACG-2: setting confidential group permissions

Modified:
    branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/services/webdav/liste=
ners/GroupeDeConfidentialiteListener.java
    branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/conf.xml
    branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/defs.xml
    branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/domain.xml
    branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/spring/applicatio=
ncontext-slide.xml

Modified: branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/services/webdav=
/listeners/GroupeDeConfidentialiteListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/src/java/org/jahia/services/webdav/listeners/GroupeDeConfidential=
iteListener.java&rev=3D17340&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/services/webdav/liste=
ners/GroupeDeConfidentialiteListener.java (original)
+++ branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/services/webdav/liste=
ners/GroupeDeConfidentialiteListener.java Tue May 22 12:35:05 2007
@@ -1,12 +1,8 @@
 package org.jahia.services.webdav.listeners;
 =

 import org.jahia.data.events.JahiaEventListener;
-import org.jahia.services.webdav.JahiaWebdavBaseService;
 import org.jahia.services.webdav.DAVFileAccess;
-import org.jahia.services.webdav.model.PropertyDefinition;
 import org.jahia.services.sites.JahiaSite;
-import org.jahia.services.fileextraction.ExtractedDocument;
-import org.jahia.services.acl.JahiaBaseACL;
 import org.jahia.services.usermanager.JahiaGroupManagerService;
 import org.jahia.services.usermanager.JahiaUserManagerService;
 import org.jahia.services.search.analyzer.LanguageIndependantFilter;
@@ -27,8 +23,6 @@
 import org.apache.slide.content.NodeRevisionDescriptors;
 import org.apache.slide.content.NodeProperty;
 import org.apache.slide.webdav.util.WebdavUtils;
-import org.apache.slide.security.NodePermission;
-import org.apache.slide.security.JahiaWebdavSecurity;
 import org.apache.slide.structure.ObjectNode;
 import org.apache.commons.lang.StringUtils;
 =

@@ -50,6 +44,8 @@
     private static final String GUEST =3D "GUEST";
 =

     private PropertyName serviceEmetteurPropName;
+    private PropertyName projectPropName;
+    private PropertyName copyAServicePropName;
     private PropertyName groupDeConfidentialitePropName;
     private HashMap acls =3D new HashMap();
 =

@@ -65,6 +61,10 @@
                 this.groupDeConfidentialitePropName =3D propertyName;
             } else if ( id !=3D null && "ServiceEmetteur".equals(id)){
                 this.serviceEmetteurPropName =3D propertyName;
+            } else if ( id !=3D null && "Projet".equals(id)){
+                this.projectPropName =3D propertyName;
+            } else if ( id !=3D null && "CopieA".equals(id)){
+                this.copyAServicePropName =3D propertyName;
             }
         }
         Configuration aclConfs =3D configuration.getConfiguration("acl-map=
ping");
@@ -112,7 +112,7 @@
                         contentEvent.getNamespace().getName());
                 final DAVFileAccess davObject =3D new DAVFileAccess(site, =
token, uri.toString());
                 NodeProperty prop =3D descriptor.getProperty(this.groupDeC=
onfidentialitePropName);
-                if ( prop !=3D null & !"".equals(prop.getValue().toString(=
).trim()) ){
+                if ( prop !=3D null && !"".equals(prop.getValue().toString=
().trim()) ){
                     String groupName =3D (String)this.acls.get(prop.getVal=
ue().toString());
                     if ( groupName !=3D null ){
                         String subject =3D "+/groups/" + getValidGroupName=
(groupName) + "/members";
@@ -120,14 +120,19 @@
                             revokePermFirst =3D false;
                             if ( !GUEST.equals(groupName) ){
                                 changeAllPermissions(davObject,"---");
-                                davObject.changePermissions(subject,"R--");
+                                davObject.changePermissions(subject,"RW-");
+                                return;
                             } else {
-                                 revokeAllPermissions(davObject,false);
+                                revokeAllPermissions(davObject,false);
                             }
                         } else {
                             ObjectNode objectNode =3D uri.getStore().retri=
eveObject(uri);
-                            setEmittingGroupDefaultPermission(uri,token,de=
scriptor,objectNode,
-                                    true);
+                            setConfidentialityGroupDefaultPermission(uri,t=
oken,descriptor,objectNode,
+                                    true,this.serviceEmetteurPropName);
+                            setConfidentialityGroupDefaultPermission(uri,t=
oken,descriptor,objectNode,
+                                    false,this.copyAServicePropName);
+                            setConfidentialityGroupDefaultPermission(uri,t=
oken,descriptor,objectNode,
+                                    false,this.projectPropName);
                             return;
                         }
                     }
@@ -136,23 +141,65 @@
                 logger.debug("Error revoking permission",e);
             }
         }
+
+        NodeProperty prop =3D descriptor.getProperty(this.groupDeConfident=
ialitePropName);
+        if ( prop !=3D null && prop.getValue() !=3D null && !"".equals(pro=
p.getValue().toString().trim()) ){
+            String groupName =3D (String)this.acls.get(prop.getValue().toS=
tring());
+            if ( groupName !=3D null ){
+                if ( !groupName.equals(SERVICE_EMETTEUR) && !groupName.equ=
als(GUEST) ){
+                    return;    =

+                }
+            }
+        }
+
         // 2) set by default Read and Write permissions for the Emitting s=
ervice
         hasChanged =3D hasChanged || hasChanged(uri, this.serviceEmetteurP=
ropName, descriptor);
         if ( hasChanged ){
             try {
                 ObjectNode objectNode =3D uri.getStore().retrieveObject(ur=
i);
-                setEmittingGroupDefaultPermission(uri,token,descriptor,obj=
ectNode,revokePermFirst);
+                setConfidentialityGroupDefaultPermission(uri,token,descrip=
tor,objectNode,revokePermFirst,
+                        this.serviceEmetteurPropName);
+                if ( revokePermFirst ){
+                    revokePermFirst =3D false;
+                }
+            } catch ( Throwable t ){
+                logger.debug("error setting permission",t);
+            }
+        }
+        // 3) set by default Read and Write permissions for the Project
+        hasChanged =3D hasChanged || hasChanged(uri, this.projectPropName,=
 descriptor);
+        if ( hasChanged ){
+            try {
+                ObjectNode objectNode =3D uri.getStore().retrieveObject(ur=
i);
+                setConfidentialityGroupDefaultPermission(uri,token,descrip=
tor,objectNode,revokePermFirst,
+                        this.projectPropName);
+                if ( revokePermFirst ){
+                    revokePermFirst =3D false;
+                }
+            } catch ( Throwable t ){
+                logger.debug("error setting permission",t);
+            }
+        }
+        // 4) set by default Read permission for the CopyTo service
+        hasChanged =3D hasChanged || hasChanged(uri, this.copyAServiceProp=
Name, descriptor);
+        if ( hasChanged ){
+            try {
+                ObjectNode objectNode =3D uri.getStore().retrieveObject(ur=
i);
+                setConfidentialityGroupDefaultPermission(uri,token,descrip=
tor,objectNode,revokePermFirst,
+                        this.copyAServicePropName);
             } catch ( Throwable t ){
                 logger.debug("error setting permission",t);
             }
         }
     }
 =

-    protected void setEmittingGroupDefaultPermission(Uri uri,
+    protected void setConfidentialityGroupDefaultPermission(Uri uri,
                                                      SlideToken token,
                                                      NodeRevisionDescripto=
r descriptor,
                                                      ObjectNode objectNode,
-                                                     boolean revokePermFir=
st) throws Exception {
+                                                     boolean revokePermFir=
st,
+                                                     PropertyName propGrou=
pName) throws Exception {
+
         final JahiaSite site =3D ServicesRegistry.getInstance().getJahiaSi=
tesService().getSiteByKey(
                 uri.getNamespace().getName());
         final DAVFileAccess davObject =3D new DAVFileAccess(site, token, u=
ri.toString());
@@ -161,8 +208,7 @@
         }
         if ( davObject.getRevisionDescriptor() !=3D null ){
             // try to remove old perms
-            Object oldProp =3D davObject.getProperty(this.serviceEmetteurP=
ropName.getNamespace(),
-                    this.serviceEmetteurPropName.getName());
+            Object oldProp =3D davObject.getProperty(propGroupName.getName=
space(), propGroupName.getName());
             if ( oldProp !=3D null ){
                 String value =3D "";
                 if ( oldProp instanceof NodeProperty ){
@@ -180,17 +226,31 @@
                 }
             }
         }
-        NodeProperty prop =3D descriptor.getProperty(this.serviceEmetteurP=
ropName);
+        NodeProperty prop =3D descriptor.getProperty(propGroupName);
         if ( prop =3D=3D null || "".equals(prop.getValue()) ){
             return;
         }
         String value =3D prop.getValue().toString();
+        String sep =3D ",";
+        if (this.copyAServicePropName !=3D null && propGroupName.getName()=
.equals(this.copyAServicePropName.getName())){
+            sep =3D ";";
+        }
         String[] tokens =3D StringUtils.split(value,',');
         String strToken =3D null;
+        String perm =3D "RW-";
+        if (this.copyAServicePropName !=3D null && propGroupName.getName()=
.equals(this.copyAServicePropName.getName())){
+            perm =3D "R--";
+        }
+        boolean removeUserGroupPerm =3D false;
         for ( int i=3D0; i<tokens.length; i++ ){
             strToken =3D tokens[i].trim();
             String subject =3D "+/groups/" + getValidGroupName(strToken) +=
 "/members";
-            davObject.changePermissions(subject,"RW-");
+            davObject.changePermissions(subject,perm);
+            if ( !removeUserGroupPerm ){
+                removeUserGroupPerm =3D true;
+                //changeAllPermissions(davObject, "---","users");
+                davObject.changePermissions("+/groups/users/members","---"=
);
+            }
         }
     }
 =

@@ -213,6 +273,27 @@
         }
     }
 =

+    protected void changeAllPermissions(DAVFileAccess davObject, String pe=
rm, String subject){
+        Map read =3D davObject.getPermissions(DAVFileAccess.READ);
+        Map write =3D davObject.getPermissions(DAVFileAccess.WRITE);
+        Map admin =3D davObject.getPermissions(DAVFileAccess.MANAGE);
+        Set users =3D new HashSet();
+        users.removeAll(read.keySet());
+        users.addAll(read.keySet());
+        users.removeAll(write.keySet());
+        users.addAll(write.keySet());
+        users.removeAll(admin.keySet());
+        users.addAll(admin.keySet());
+        Iterator it =3D users.iterator();
+        String subj =3D null;
+        while ( it.hasNext() ){
+            subj =3D getSubject((String)it.next());
+            if ( subj.equals(subject) ){
+                davObject.changePermissions(subject,perm);
+            }
+        }
+    }
+
     protected void revokeAllPermissions(DAVFileAccess davObject, boolean w=
ithInherited){
         if ( withInherited ){
             Map read =3D getPermissions(davObject,withInherited,DAVFileAcc=
ess.READ);

Modified: branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/conf.=
xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/src/webapp/WEB-INF/etc/slide/conf.xml&rev=3D17340&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/conf.xml (o=
riginal)
+++ branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/conf.xml Tu=
e May 22 12:35:05 2007
@@ -96,10 +96,11 @@
             <instruction label=3D"SysDocProto_NoDossier" property=3D"SysDo=
cProto_NoDossier"/>
             <instruction label=3D"SysDocProto_CleTypeProcessus" property=
=3D"SysDocProto_CleTypeProcessus"/>
             <instruction label=3D"SysDocProto_CleGroupeDiffusion" property=
=3D"SysDocProto_CleGroupeDiffusion"/>
-            <instruction label=3D"SysDocProto_CleGroupeConfidentialite" pr=
operty=3D"SysDocProto_CleGroupeConfidentialite"/>
-            <instruction label=3D"SysDocProto_project" property=3D"SysDocP=
roto_project"/>
-            <instruction label=3D"SysDocProto_service" property=3D"SysDocP=
roto_service"/>
-            <instruction label=3D"SysDocProto_chartOfAccounts" property=3D=
"SysDocProto_chartOfAccounts"/>
+            <instruction label=3D"SysDocProto_CodeGroupeConfidentialite" p=
roperty=3D"SysDocProto_CodeGroupeConfidentialite"/>
+            <instruction label=3D"SysDocProto_CodeProjet" property=3D"SysD=
ocProto_CodeProjet"/>
+            <instruction label=3D"SysDocProto_CodeService" property=3D"Sys=
DocProto_CodeService"/>
+            <instruction label=3D"SysDocProto_CoteClassement" property=3D"=
SysDocProto_CoteClassement"/>
+            <instruction label=3D"SysDocProto_CodeServiceCopieA" property=
=3D"SysDocProto_CodeServiceCopieA"/>
 =

         </office-property-mapping>
 =


Modified: branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/defs.=
xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/src/webapp/WEB-INF/etc/slide/defs.xml&rev=3D17340&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/defs.xml (o=
riginal)
+++ branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/defs.xml Tu=
e May 22 12:35:05 2007
@@ -156,7 +156,7 @@
                                                <string/>
                                                <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
                                        </property>
-                                       <property 
name=3D"SysDocProto_CleGroupeConfidentialite" namespace=3D"=
FILEPROP:">
+                                       <property 
name=3D"SysDocProto_CodeGroupeConfidentialite" namespace=3D=
"FILEPROP:">
                                                <string/>
                                                <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
                                        </property>
@@ -167,39 +167,10 @@
                                                <string/>
                                                <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
                                        </property>
-
-                                       <property name=3D"department" 
namespace=3D"GED:">
-                                               <string/>
-                                               <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
-                                       </property>
-                                       <property name=3D"department-path" 
namespace=3D"GED:">
-                                               <string/>
-                                               <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
-                                       </property>
-                                       <property name=3D"department-alias" 
namespace=3D"GED:">
-                                               <string/>
-                                               <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
-                                       </property>
-                                       <property 
name=3D"department-alias-path" namespace=3D"GED:">
-                                               <string/>
-                                               <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
-                                       </property>
                                        <property name=3D"project" 
namespace=3D"GED:">
                                                <string/>
                                                <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
                                        </property>
-                                       <property name=3D"project-path" 
namespace=3D"GED:">
-                                               <string/>
-                                               <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
-                                       </property>
-                                       <property name=3D"project-alias" 
namespace=3D"GED:">
-                                               <string/>
-                                               <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
-                                       </property>
-                                       <property name=3D"project-alias-path" 
namespace=3D"GED:">
-                                               <string/>
-                                               <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />
-                                       </property>
                                        <property name=3D"service" 
namespace=3D"GED:">
                                                <string/>
                                                <text 
analyzer=3D"org.jahia.services.search.analyzer.SlideStandardAn=
alyzer" />

Modified: branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/domai=
n.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/src/webapp/WEB-INF/etc/slide/domain.xml&rev=3D17340&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/domain.xml =
(original)
+++ branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/slide/domain.xml =
Tue May 22 12:35:05 2007
@@ -44,10 +44,11 @@
                              namespace=3D"FILEPROP:"/>
                 <instruction label=3D"SysDocProto_CleGroupeDiffusion" prop=
erty=3D"SysDocProto_CleGroupeDiffusion"
                              namespace=3D"FILEPROP:"/>
-                <instruction label=3D"SysDocProto_CleGroupeConfidentialite"
-                             property=3D"SysDocProto_CleGroupeConfidential=
ite" namespace=3D"FILEPROP:"/>
-                <instruction label=3D"SysDocProto_project" property=3D"Sys=
DocProto_project" namespace=3D"FILEPROP:"/>
-                <instruction label=3D"SysDocProto_service" property=3D"Sys=
DocProto_service" namespace=3D"FILEPROP:"/>
+                <instruction label=3D"SysDocProto_CodeGroupeConfidentialit=
e"
+                             property=3D"SysDocProto_CodeGroupeConfidentia=
lite" namespace=3D"FILEPROP:"/>
+                <instruction label=3D"SysDocProto_CodeProjet" property=3D"=
SysDocProto_CodeProjet" namespace=3D"FILEPROP:"/>
+                <instruction label=3D"SysDocProto_CodeService" property=3D=
"SysDocProto_CodeService" namespace=3D"FILEPROP:"/>
+                <instruction label=3D"SysDocProto_CodeServiceCopieA" prope=
rty=3D"SysDocProto_CodeServiceCopieA" namespace=3D"FILEPROP:"/>
                 <instruction label=3D"SysDocProto_chartOfAccounts" propert=
y=3D"SysDocProto_chartOfAccounts"
                              namespace=3D"FILEPROP:"/>
 =

@@ -127,15 +128,17 @@
             <configuration>
                 <nameSpace classname=3D"java.lang.String" name=3D"FILEPROP=
:"/>
                 <preFix classname=3D"java.lang.String" name=3D"SysDocProto=
_"/>
-                <property classname=3D"java.lang.String" name=3D"SysDocPro=
to_project"/>
-                <property classname=3D"java.lang.String" name=3D"SysDocPro=
to_service"/>
+                <property classname=3D"java.lang.String" name=3D"SysDocPro=
to_CodeProjet"/>
+                <property classname=3D"java.lang.String" name=3D"SysDocPro=
to_CodeService"/>
                 <property classname=3D"java.lang.String" name=3D"SysDocPro=
to_chartOfAccounts"/>
             </configuration>
         </listener>
         <listener classname=3D"org.jahia.services.webdav.listeners.GroupeD=
eConfidentialiteListener">
             <configuration>
-                <instruction id=3D"GroupeConfidentialite" property=3D"SysD=
ocProto_CleGroupeConfidentialite" namespace=3D"FILEPROP:"/>
-                <instruction id=3D"ServiceEmetteur" property=3D"SysDocProt=
o_service" namespace=3D"FILEPROP:"/>
+                <instruction id=3D"GroupeConfidentialite" property=3D"SysD=
ocProto_CodeGroupeConfidentialite" namespace=3D"FILEPROP:"/>
+                <instruction id=3D"ServiceEmetteur" property=3D"SysDocProt=
o_CodeService" namespace=3D"FILEPROP:"/>
+                <instruction id=3D"CopieA" property=3D"SysDocProto_CodeSer=
viceCopieA" namespace=3D"FILEPROP:"/>
+                <instruction id=3D"Projet" property=3D"SysDocProto_CodePro=
jet" namespace=3D"FILEPROP:"/>
                 <acl-mapping>
                     <instruction id=3D"0" acl=3D"GUEST"/>
                     <instruction id=3D"1" acl=3D"SERVICE_EMETTEUR"/>

Modified: branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/spring/appl=
icationcontext-slide.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-slide.xml&rev=3D=
17340&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/spring/applicatio=
ncontext-slide.xml (original)
+++ branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/etc/spring/applicatio=
ncontext-slide.xml Tue May 22 12:35:05 2007
@@ -11,14 +11,7 @@
                 <ref bean=3D"status"/>
                 <ref bean=3D"project"/>
                 <ref bean=3D"service"/>
-                <ref bean=3D"project-path"/>
-                <ref bean=3D"project-alias"/>
-                <ref bean=3D"project-alias-path"/>
-                <!--<ref bean=3D"department"/>-->
-                <ref bean=3D"department-path"/>
-                <ref bean=3D"department-alias"/>
-                <ref bean=3D"department-alias-path"/>
-                <ref bean=3D"displayname"/>
+               <ref bean=3D"displayname"/>
                 <ref bean=3D"categories"/>
                 <ref bean=3D"chartOfAccounts"/>
             </list>
@@ -79,14 +72,12 @@
         </property>
         <property name=3D"type">
             <value>categoryType</value>
-        <!--<value>folderPathType</value>-->
         </property>
         <!--<property name=3D"rootCategory">
             <value>Projets</value>
         </property> -->
         <property name=3D"defaultValue">
             <value>Hidden</value>
-        <!--<value>Hidden</value>-->
         </property>
         <!--
         <property name=3D"values">
@@ -137,187 +128,6 @@
         </property>-->
     </bean>
 =

-    <bean id=3D"project-path" class=3D"org.jahia.services.webdav.model.Pro=
pertyDefinition">
-        <property name=3D"name">
-            <value>project-path</value>
-        </property>
-        <property name=3D"namespace">
-            <value>GED:</value>
-        </property>
-        <property name=3D"readOnly">
-            <value>true</value>
-        </property>
-        <property name=3D"autoCreate">
-            <value>true</value>
-        </property>
-        <property name=3D"hidden">
-            <value>true</value>
-        </property>
-    </bean>
-
-    <bean id=3D"project-alias" class=3D"org.jahia.services.webdav.model.Pr=
opertyDefinition">
-        <property name=3D"name">
-            <value>project-alias</value>
-        </property>
-        <property name=3D"namespace">
-            <value>GED:</value>
-        </property>
-        <property name=3D"readOnly">
-            <value>false</value>
-        </property>
-        <property name=3D"autoCreate">
-            <value>true</value>
-        </property>
-        <property name=3D"hidden">
-            <value>true</value>
-        </property>
-        <property name=3D"copyToAllChildren">
-             <value>false</value>
-        </property>
-        <property name=3D"defaultValue">
-            <value></value>
-        </property>
-    </bean>
-
-    <bean id=3D"project-alias-path" class=3D"org.jahia.services.webdav.mod=
el.PropertyDefinition">
-        <property name=3D"name">
-            <value>project-alias-path</value>
-        </property>
-        <property name=3D"namespace">
-            <value>GED:</value>
-        </property>
-        <property name=3D"readOnly">
-            <value>true</value>
-        </property>
-        <property name=3D"autoCreate">
-            <value>true</value>
-        </property>
-        <property name=3D"hidden">
-            <value>true</value>
-        </property>
-        <property name=3D"copyToAllChildren">
-             <value>false</value>
-        </property>
-        <property name=3D"defaultValue">
-            <value></value>
-        </property>
-    </bean>
-
-    <bean id=3D"department" class=3D"org.jahia.services.webdav.model.Prope=
rtyDefinition">
-        <property name=3D"name">
-            <value>department</value>
-        </property>
-        <property name=3D"namespace">
-            <value>GED:</value>
-        </property>
-        <property name=3D"readOnly">
-            <value>false</value>
-        </property>
-        <property name=3D"autoCreate">
-            <value>true</value>
-        </property>
-        <property name=3D"hidden">
-            <value>true</value>
-        </property>
-        <property name=3D"type">
-            <value>categoryType</value>
-        <!--<value>folderPathType</value>-->
-        </property>
-        <!--<property name=3D"rootCategory">
-            <value>hierarchy</value>
-        </property>-->
-        <property name=3D"copyToAllChildren">
-             <value>true</value>
-        </property>
-        <property name=3D"defaultValue">
-            <value>Hidden</value>
-        <!--<value>Hidden</value>-->
-        </property>
-        <!--
-        <property name=3D"values">
-            <list>
-                <value>
-                    <![CDATA[<jahia-resource id=3D"JahiaEnginesResources" =
key=3D"org.jahia.engines.yes.label" default-value=3D"Yes"/>]]></value>
-                <value>
-                    <![CDATA[<jahia-resource id=3D"JahiaEnginesResources" =
key=3D"org.jahia.engines.no.label" default-value=3D"No"/>]]></value>
-                <value>
-                    <![CDATA[<jahia-resource id=3D"JahiaEnginesResources" =
key=3D"org.jahia.engines.filemanager.Filemanager_Engine.hidden.label" defau=
lt-value=3D"Hidden"/>]]></value>
-            </list>
-        </property>
-        <property name=3D"helpText">
-            <value>
-                <![CDATA[<jahia-resource id=3D"JahiaEnginesResources" key=
=3D"org.jahia.engines.filemanager.Filemanager_Engine.helpGed.label"/>]]>
-            </value>
-        </property>
-        -->
-    </bean>
-
-    <bean id=3D"department-path" class=3D"org.jahia.services.webdav.model.=
PropertyDefinition">
-        <property name=3D"name">
-            <value>department-path</value>
-        </property>
-        <property name=3D"namespace">
-            <value>GED:</value>
-        </property>
-        <property name=3D"readOnly">
-            <value>true</value>
-        </property>
-        <property name=3D"autoCreate">
-            <value>true</value>
-        </property>
-        <property name=3D"hidden">
-            <value>true</value>
-        </property>
-    </bean>
-
-    <bean id=3D"department-alias" class=3D"org.jahia.services.webdav.model=
.PropertyDefinition">
-        <property name=3D"name">
-            <value>department-alias</value>
-        </property>
-        <property name=3D"namespace">
-            <value>GED:</value>
-        </property>
-        <property name=3D"readOnly">
-            <value>false</value>
-        </property>
-        <property name=3D"autoCreate">
-            <value>true</value>
-        </property>
-        <property name=3D"hidden">
-            <value>true</value>
-        </property>
-        <property name=3D"copyToAllChildren">
-             <value>false</value>
-        </property>
-        <property name=3D"defaultValue">
-            <value></value>
-        </property>
-    </bean>
-
-    <bean id=3D"department-alias-path" class=3D"org.jahia.services.webdav.=
model.PropertyDefinition">
-        <property name=3D"name">
-            <value>department-alias-path</value>
-        </property>
-        <property name=3D"namespace">
-            <value>GED:</value>
-        </property>
-        <property name=3D"readOnly">
-            <value>true</value>
-        </property>
-        <property name=3D"autoCreate">
-            <value>true</value>
-        </property>
-        <property name=3D"hidden">
-            <value>true</value>
-        </property>
-        <property name=3D"copyToAllChildren">
-             <value>false</value>
-        </property>
-        <property name=3D"defaultValue">
-            <value></value>
-        </property>
-    </bean>
-
     <bean id=3D"displayname" class=3D"org.jahia.services.webdav.model.Prop=
ertyDefinition">
         <property name=3D"name">
             <value>displayname</value>

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to