Project

General

Profile

Revision 376b705d

ID376b705de7f742db3e2f6e2700b01bf6eb2b379d
Parent afbe7dc1
Child f758df66

Added by Andreas Müller 6 months ago

remove "hibernate" from permission packages (cont.)

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/voter/CollectionVoter.java
10 10
        return Collection.class;
11 11
    }
12 12

  
13
    /* (non-Javadoc)
14
     * @see eu.etaxonomy.cdm.persistence.hibernate.permission.voter.CdmPermissionVoter#isOrpahn(eu.etaxonomy.cdm.model.common.CdmBase)
15
     */
16 13
    @Override
17 14
    public boolean isOrpahn(CdmBase object) {
18 15
        return false;
19 16
    }
20

  
21 17
}
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/voter/DescriptionElementVoter.java
65 65
        return ACCESS_ABSTAIN;
66 66
    }
67 67

  
68
    /* (non-Javadoc)
69
     * @see eu.etaxonomy.cdm.persistence.hibernate.permission.voter.CdmPermissionVoter#isOrpahn(eu.etaxonomy.cdm.model.common.CdmBase)
70
     */
71 68
    @Override
72 69
    public boolean isOrpahn(CdmBase object) {
73 70
        if(object instanceof DescriptionElementBase){
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/security_base.xml
35 35
    <!--
36 36
      ============================== SECURITY ==============================
37 37
    -->
38
    <bean id="accessDecisionManager" class="eu.etaxonomy.cdm.persistence.hibernate.permission.UnanimousBasedUnrevokable">
38
    <bean id="accessDecisionManager" class="eu.etaxonomy.cdm.persistence.permission.UnanimousBasedUnrevokable">
39 39
        <constructor-arg>
40 40
            <list>
41
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.GrantAlwaysVoter" />
42
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.TaxonNodeVoter" />
43
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.TaxonBaseVoter" />
44
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.DescriptionBaseVoter" />
45
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.DescriptionElementVoter" />
46
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.TaxonNameVoter" />
47
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.ReferenceVoter" />
48
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.CollectionVoter" />
49
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.TeamOrPersonBaseVoter" />
50
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.RegistrationVoter" />
51
                <bean class="eu.etaxonomy.cdm.persistence.hibernate.permission.voter.SpecimenOrObservationBaseVoter" />
41
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.GrantAlwaysVoter" />
42
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.TaxonNodeVoter" />
43
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.TaxonBaseVoter" />
44
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.DescriptionBaseVoter" />
45
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.DescriptionElementVoter" />
46
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.TaxonNameVoter" />
47
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.ReferenceVoter" />
48
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.CollectionVoter" />
49
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.TeamOrPersonBaseVoter" />
50
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.RegistrationVoter" />
51
                <bean class="eu.etaxonomy.cdm.persistence.permission.voter.SpecimenOrObservationBaseVoter" />
52 52
            </list>
53 53
        </constructor-arg>
54 54
    </bean>
......
56 56
    <!--
57 57
        CdmPermissionEvaluator.hasPermissions() evaluates the CdmPermissions like TAXONNODE.UPDATE{20c8f083-5870-4cbd-bf56-c5b2b98ab6a7}
58 58
    -->
59
    <bean id="cdmPermissionEvaluator" class="eu.etaxonomy.cdm.persistence.hibernate.permission.CdmPermissionEvaluator">
59
    <bean id="cdmPermissionEvaluator" class="eu.etaxonomy.cdm.persistence.permission.CdmPermissionEvaluator">
60 60
        <property name="accessDecisionManager" ref="accessDecisionManager" />
61 61
    </bean>
62 62

  
cdmlib-persistence/src/test/resources/log4j.properties
42 42
#log4j.logger.org.springframework.core.io.support = info
43 43

  
44 44
#### log spring security #####
45
#log4j.logger.eu.etaxonomy.cdm.persistence.hibernate.permission=debug
46
log4j.logger.eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority=warn
45
#log4j.logger.eu.etaxonomy.cdm.persistence.permission=debug
46
log4j.logger.eu.etaxonomy.cdm.persistence.permission.CdmAuthority=warn
47 47
#log4j.logger.eu.etaxonomy.cdm.persistence.hibernate.CdmSecurityHibernateInterceptor=debug
48 48
#log4j.logger.org.springframework.security.access.intercept=debug
49 49
#log4j.logger.org.springframework.security.access.vote=debug
cdmlib-services/src/test/resources/log4j.properties
114 114
#log4j.logger.org.dbunit.operation.DeleteAllOperation=debug
115 115

  
116 116
#### log spring security #####
117
#log4j.logger.eu.etaxonomy.cdm.persistence.hibernate.permission=debug
118
log4j.logger.eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority=warn
117
#log4j.logger.eu.etaxonomy.cdm.persistence.permission=debug
118
log4j.logger.eu.etaxonomy.cdm.persistence.permission.CdmAuthority=warn
119 119
#log4j.logger.eu.etaxonomy.cdm.persistence.hibernate.CdmSecurityHibernateInterceptor=debug
120 120
#log4j.logger.org.springframework.security.access.intercept=debug
121 121
#log4j.logger.org.springframework.security.access.vote=debug

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)